https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112162
Revision: 112162
Author: reedy
Date: 2012-02-22 23:24:51 +0000 (Wed, 22 Feb 2012)
Log Message:
-----------
Merged revision r112034, r112037, r112100, r112141, r112152 from trunk/phase3
Modified Paths:
--------------
branches/wmf/1.19wmf1/RELEASE-NOTES-1.19
branches/wmf/1.19wmf1/includes/SkinTemplate.php
branches/wmf/1.19wmf1/maintenance/language/messageTypes.inc
branches/wmf/1.19wmf1/maintenance/language/messages.inc
Property Changed:
----------------
branches/wmf/1.19wmf1/
branches/wmf/1.19wmf1/includes/
Property changes on: branches/wmf/1.19wmf1
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting:100352-107913
/branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/branches/wmf/1.18wmf1:97508,111667
/trunk/phase3:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251,111397,111571,111574,111597,111658,111673,111695,111697,111750,111802-111803,111827,111965-111967,112021,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112128,112132-112133
+ /branches/JSTesting:100352-107913
/branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/branches/wmf/1.18wmf1:97508,111667
/trunk/phase3:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251,111397,111571,111574,111597,111658,111673,111695,111697,111750,111802-111803,111827,111965-111967,112021,112034,112037,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112100,112128,112132-112133,112141,112152
Modified: branches/wmf/1.19wmf1/RELEASE-NOTES-1.19
===================================================================
--- branches/wmf/1.19wmf1/RELEASE-NOTES-1.19 2012-02-22 23:15:21 UTC (rev
112161)
+++ branches/wmf/1.19wmf1/RELEASE-NOTES-1.19 2012-02-22 23:24:51 UTC (rev
112162)
@@ -247,6 +247,7 @@
* (bug 31676) Group dynamically inserted CSS into a single <style> tag, to work
around a bug where not all styles were applied in Internet Explorer
* (bug 28936, bug 5280) Broken or invalid titles can't be removed from
watchlist.
+* (bug 34600) Older skins using useHeadElement=false were broken in 1.18
=== API changes in 1.19 ===
* Made action=edit less likely to return "unknownerror", by returning the
actual error
Property changes on: branches/wmf/1.19wmf1/includes
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting/includes:100352-107913
/branches/REL1_15/phase3/includes:51646
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf/1.18wmf1/includes:97508,111667
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:111029,111034,111067,111085,111128,111144,111251,111397,111571,111574,111597,111658,111673,111695,111697,111750,111827,111965-111967,112021,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112128,112132-112133
+ /branches/JSTesting/includes:100352-107913
/branches/REL1_15/phase3/includes:51646
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf/1.18wmf1/includes:97508,111667
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:111029,111034,111067,111085,111128,111144,111251,111397,111571,111574,111597,111658,111673,111695,111697,111750,111827,111965-111967,112021,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112128,112132-112133,112152
Modified: branches/wmf/1.19wmf1/includes/SkinTemplate.php
===================================================================
--- branches/wmf/1.19wmf1/includes/SkinTemplate.php 2012-02-22 23:15:21 UTC
(rev 112161)
+++ branches/wmf/1.19wmf1/includes/SkinTemplate.php 2012-02-22 23:24:51 UTC
(rev 112162)
@@ -455,7 +455,7 @@
if ( $this->useHeadElement ) {
$tpl->set( 'headelement', $out->headElement( $this ) );
} else {
- $tpl->set( 'headscripts', $out->getScript() );
+ $tpl->set( 'headscripts', $out->getHeadScripts() .
$out->getHeadItems() );
}
$tpl->set( 'debughtml', $this->generateDebugHTML() );
Modified: branches/wmf/1.19wmf1/maintenance/language/messageTypes.inc
===================================================================
--- branches/wmf/1.19wmf1/maintenance/language/messageTypes.inc 2012-02-22
23:15:21 UTC (rev 112161)
+++ branches/wmf/1.19wmf1/maintenance/language/messageTypes.inc 2012-02-22
23:24:51 UTC (rev 112162)
@@ -191,6 +191,32 @@
'longpage-hint',
'javascripttest-backlink',
'javascripttest-qunit-name',
+ 'revdelete-logentry',
+ 'logdelete-logentry',
+ 'revdelete-content',
+ 'revdelete-summary',
+ 'revdelete-uname',
+ 'revdelete-hid',
+ 'revdelete-unhid',
+ 'revdelete-log-message',
+ 'logdelete-log-message',
+ 'deletedarticle',
+ 'suppressedarticle',
+ 'undeletedarticle',
+ 'patrol-log-line',
+ 'patrol-log-auto',
+ 'patrol-log-diff',
+ '1movedto2',
+ '1movedto2_redir',
+ 'move-redirect-suppressed',
+ 'newuserlog-byemail',
+ 'newuserlog-create-entry',
+ 'newuserlog-create2-entry',
+ 'newuserlog-autocreate-entry',
+ 'suppressedarticle',
+ 'deletedarticle',
+ 'uploadedimage',
+ 'overwroteimage',
);
/** Optional messages, which may be translated only if changed in the target
language. */
Modified: branches/wmf/1.19wmf1/maintenance/language/messages.inc
===================================================================
--- branches/wmf/1.19wmf1/maintenance/language/messages.inc 2012-02-22
23:15:21 UTC (rev 112161)
+++ branches/wmf/1.19wmf1/maintenance/language/messages.inc 2012-02-22
23:24:51 UTC (rev 112162)
@@ -3578,6 +3578,34 @@
'logentry-newusers-autocreate',
'newuserlog-byemail',
),
+ 'logging-irc' => array(
+ 'revdelete-logentry',
+ 'logdelete-logentry',
+ 'revdelete-content',
+ 'revdelete-summary',
+ 'revdelete-uname',
+ 'revdelete-hid',
+ 'revdelete-unhid',
+ 'revdelete-log-message',
+ 'logdelete-log-message',
+ 'deletedarticle',
+ 'suppressedarticle',
+ 'undeletedarticle',
+ 'patrol-log-line',
+ 'patrol-log-auto',
+ 'patrol-log-diff',
+ '1movedto2',
+ '1movedto2_redir',
+ 'move-redirect-suppressed',
+ 'newuserlog-byemail',
+ 'newuserlog-create-entry',
+ 'newuserlog-create2-entry',
+ 'newuserlog-autocreate-entry',
+ 'suppressedarticle',
+ 'deletedarticle',
+ 'uploadedimage',
+ 'overwroteimage',
+ ),
'feedback' => array(
'feedback-bugornote',
'feedback-subject',
@@ -3865,6 +3893,7 @@
'html-forms' => 'HTML forms',
'sqlite' => 'SQLite database support',
'logging' => 'New logging system',
+ 'logging-irc' => 'For IRC, see bug 34508. Do not change',
'feedback' => 'Feedback',
'apierrors' => 'API errors',
);
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
