http://www.mediawiki.org/wiki/Special:Code/MediaWiki/84690
Revision: 84690
Author: demon
Date: 2011-03-24 17:38:40 +0000 (Thu, 24 Mar 2011)
Log Message:
-----------
Partial revert r84686: Yaron wants to maintain b/c in these still
Modified Paths:
--------------
trunk/extensions/AdminLinks/AdminLinks_body.php
trunk/extensions/ApprovedRevs/ApprovedRevs.hooks.php
trunk/extensions/ApprovedRevs/ApprovedRevs_body.php
trunk/extensions/ApprovedRevs/SpecialApprovedRevs.php
trunk/extensions/ReplaceText/SpecialReplaceText.php
Modified: trunk/extensions/AdminLinks/AdminLinks_body.php
===================================================================
--- trunk/extensions/AdminLinks/AdminLinks_body.php 2011-03-24 17:25:23 UTC
(rev 84689)
+++ trunk/extensions/AdminLinks/AdminLinks_body.php 2011-03-24 17:38:40 UTC
(rev 84690)
@@ -15,6 +15,11 @@
*/
function __construct() {
parent::__construct( 'AdminLinks' );
+ // deprecated in MW 1.16
+ global $wgVersion;
+ if ( version_compare( $wgVersion, '1.16', '<' ) ) {
+ wfLoadExtensionMessages( 'AdminLinks' );
+ }
global $wgUser;
$this->skin = $wgUser->getSkin();
}
@@ -85,6 +90,11 @@
global $wgUser;
// if user is a sysop, add link
if ( $wgUser->isAllowed( 'adminlinks' ) ) {
+ // deprecated in MW 1.16
+ global $wgVersion;
+ if ( version_compare( $wgVersion, '1.16', '<' ) ) {
+ wfLoadExtensionMessages( 'AdminLinks' );
+ }
$al = SpecialPage::getTitleFor( 'AdminLinks' );
$href = $al->getLocalURL();
$admin_links_vals = array(
Modified: trunk/extensions/ApprovedRevs/ApprovedRevs.hooks.php
===================================================================
--- trunk/extensions/ApprovedRevs/ApprovedRevs.hooks.php 2011-03-24
17:25:23 UTC (rev 84689)
+++ trunk/extensions/ApprovedRevs/ApprovedRevs.hooks.php 2011-03-24
17:38:40 UTC (rev 84690)
@@ -171,6 +171,7 @@
}
ApprovedRevs::addCSS();
+ ApprovedRevs::loadMessages();
$content = '';
@@ -208,6 +209,7 @@
}
ApprovedRevs::addCSS();
+ ApprovedRevs::loadMessages();
if ( $revisionID == $article->getLatest() ) {
$text = Xml::element(
'span',
@@ -260,6 +262,7 @@
$latestRevID = $title->getLatestRevID();
if ( ! empty( $approvedRevID ) && $approvedRevID !=
$latestRevID ) {
ApprovedRevs::addCSS();
+ ApprovedRevs::loadMessages();
global $wgOut;
$wgOut->addHTML( '<p class="approvedRevsEditWarning">'
. wfMsg( 'approvedrevs-editwarning' ) . "</p>\n" );
}
@@ -279,6 +282,7 @@
$latestRevID = $wgTitle->getLatestRevID();
if ( ! empty( $approvedRevID ) && $approvedRevID !=
$latestRevID ) {
ApprovedRevs::addCSS();
+ ApprovedRevs::loadMessages();
$preFormHTML .= '<p><strong>' . wfMsg(
'approvedrevs-editwarning' ) . "</strong></p>\n";
}
return true;
@@ -337,6 +341,8 @@
// this will be null if there's no ID
$approvedRevID = ApprovedRevs::getApprovedRevID(
$article->getTitle() );
$article->approvedRevID = $approvedRevID;
+ // also load extension messages, while we're at it
+ ApprovedRevs::loadMessages();
return true;
}
Modified: trunk/extensions/ApprovedRevs/ApprovedRevs_body.php
===================================================================
--- trunk/extensions/ApprovedRevs/ApprovedRevs_body.php 2011-03-24 17:25:23 UTC
(rev 84689)
+++ trunk/extensions/ApprovedRevs/ApprovedRevs_body.php 2011-03-24 17:38:40 UTC
(rev 84690)
@@ -232,4 +232,13 @@
);
$wgOut->addLink( $link );
}
+
+ public static function loadMessages() {
+ // for backwards compatibility
+ global $wgVersion;
+ if ( version_compare( $wgVersion, '1.16', '<' ) ) {
+ wfLoadExtensionMessages( 'ApprovedRevs' );
+ }
+ }
+
}
Modified: trunk/extensions/ApprovedRevs/SpecialApprovedRevs.php
===================================================================
--- trunk/extensions/ApprovedRevs/SpecialApprovedRevs.php 2011-03-24
17:25:23 UTC (rev 84689)
+++ trunk/extensions/ApprovedRevs/SpecialApprovedRevs.php 2011-03-24
17:38:40 UTC (rev 84690)
@@ -13,6 +13,7 @@
*/
function __construct() {
parent::__construct( 'ApprovedRevs' );
+ ApprovedRevs::loadMessages();
}
function execute( $query ) {
Modified: trunk/extensions/ReplaceText/SpecialReplaceText.php
===================================================================
--- trunk/extensions/ReplaceText/SpecialReplaceText.php 2011-03-24 17:25:23 UTC
(rev 84689)
+++ trunk/extensions/ReplaceText/SpecialReplaceText.php 2011-03-24 17:38:40 UTC
(rev 84690)
@@ -6,7 +6,11 @@
* Constructor
*/
public function __construct() {
+ global $wgVersion;
parent::__construct( 'ReplaceText', 'replacetext' );
+ if ( version_compare( $wgVersion, '1.16', '<' ) ) {
+ wfLoadExtensionMessages( 'ReplaceText' );
+ }
}
function execute( $query ) {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
