From 8889add2cf42a7a3cf59c20df755f015ff6f0b61 Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Thu, 27 May 2010 15:56:53 +0000 Subject: [PATCH] Revert r66934 (Removing wfLoadExtensionMessages() from everything). I disagree on principle...we branch extensions for this very reason. But people want trunk extensions compatible for several versions back, meh. --- Cite_body.php | 2 ++ SpecialCite.php | 2 ++ SpecialCite_body.php | 1 + 3 files changed, 5 insertions(+) diff --git a/Cite_body.php b/Cite_body.php index 3029f6ae4..0b0c6218d 100644 --- a/Cite_body.php +++ b/Cite_body.php @@ -152,6 +152,7 @@ class Cite { * @return string */ function ref( $str, $argv, $parser ) { + wfLoadExtensionMessages( 'Cite' ); if ( $this->mInCite ) { return htmlspecialchars( "$str" ); } else { @@ -452,6 +453,7 @@ class Cite { * @return string */ function references( $str, $argv, $parser ) { + wfLoadExtensionMessages( 'Cite' ); if ( $this->mInCite || $this->mInReferences ) { if ( is_null( $str ) ) { return htmlspecialchars( "" ); diff --git a/SpecialCite.php b/SpecialCite.php index 57f83e6b3..6988395a1 100644 --- a/SpecialCite.php +++ b/SpecialCite.php @@ -33,6 +33,7 @@ $wgSpecialPages['Cite'] = 'SpecialCite'; $wgAutoloadClasses['SpecialCite'] = $dir . 'SpecialCite_body.php'; function wfSpecialCiteNav( &$skintemplate, &$nav_urls, &$oldid, &$revid ) { + wfLoadExtensionMessages( 'SpecialCite' ); // check whether we’re in the right namespace, the $revid has the correct type and is not empty // (what would mean that the current page doesn’t exist) if ( $skintemplate->mTitle->isContentPage() && $revid !== 0 && !empty( $revid ) ) @@ -50,6 +51,7 @@ function wfSpecialCiteToolbox( &$skin ) { global $wgUser; if ( isset( $skin->data['nav_urls']['cite'] ) ) { + wfLoadExtensionMessages( 'SpecialCite' ); echo Html::rawElement( 'li', array( 'id' => 't-cite' ), diff --git a/SpecialCite_body.php b/SpecialCite_body.php index 83c8c38f4..7cd8d3721 100644 --- a/SpecialCite_body.php +++ b/SpecialCite_body.php @@ -15,6 +15,7 @@ class SpecialCite extends SpecialPage { function execute( $par ) { global $wgOut, $wgRequest, $wgUseTidy; + wfLoadExtensionMessages( 'SpecialCite' ); // Having tidy on causes whitespace and
 tags to
 		// be generated around the output of the CiteOutput