From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Fri, 19 Dec 2008 08:54:51 +0000 (+0000)
Subject: * Springle some parsemag to the sidebar and tagline per bug 16669
X-Git-Tag: 1.31.0-rc.0~43881
X-Git-Url: https://git.cyclocoop.org/admin/?a=commitdiff_plain;h=e4f6c026a726d2b67b7b240de71572e7659f3814;p=lhc%2Fweb%2Fwiklou.git

* Springle some parsemag to the sidebar and tagline per bug 16669
---

diff --git a/includes/QueryPage.php b/includes/QueryPage.php
index 5f1acdb955..0b58750803 100644
--- a/includes/QueryPage.php
+++ b/includes/QueryPage.php
@@ -534,7 +534,7 @@ class QueryPage {
 	}
 
 	function feedDesc() {
-		return wfMsg( 'tagline' );
+		return wfMsgExt( 'tagline', 'parsemag' );
 	}
 
 	function feedUrl() {
diff --git a/includes/Skin.php b/includes/Skin.php
index e115895892..f4744dc1c7 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1023,7 +1023,7 @@ END;
 		$sub = $wgOut->getSubtitle();
 		if ( '' == $sub ) {
 			global $wgExtraSubtitle;
-			$sub = wfMsg( 'tagline' ) . $wgExtraSubtitle;
+			$sub = wfMsgExt( 'tagline', 'parsemag' ) . $wgExtraSubtitle;
 		}
 		$subpages = $this->subPageSubtitle();
 		$sub .= !empty($subpages)?"</p><p class='subpages'>$subpages":'';
@@ -1840,7 +1840,9 @@ END;
 					$link = wfMsgForContent( $line[0] );
 					if ($link == '-')
 						continue;
-					if (wfEmptyMsg($line[1], $text = wfMsg($line[1])))
+
+					$text = wfMsgExt($line[1], 'parsemag');
+					if (wfEmptyMsg($line[1], $text))
 						$text = $line[1];
 					if (wfEmptyMsg($line[0], $link))
 						$link = $line[0];
diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php
index bca2f57eb1..af88aef822 100644
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -299,7 +299,7 @@ class SpecialContributions extends SpecialPage {
 
 		$feed = new $wgFeedClasses[$type](
 			$this->feedTitle(),
-			wfMsg( 'tagline' ),
+			wfMsgExt( 'tagline', 'parsemag' ),
 			$this->getTitle()->getFullUrl() );
 			
 		// Already valid title
diff --git a/includes/specials/SpecialNewpages.php b/includes/specials/SpecialNewpages.php
index 0f5cfe4e9a..ff5a43c0d2 100644
--- a/includes/specials/SpecialNewpages.php
+++ b/includes/specials/SpecialNewpages.php
@@ -281,7 +281,7 @@ class SpecialNewpages extends SpecialPage {
 
 		$feed = new $wgFeedClasses[$type](
 			$this->feedTitle(),
-			wfMsg( 'tagline' ),
+			wfMsgExt( 'tagline', 'parsemag' ),
 			$this->getTitle()->getFullUrl() );
 
 		$pager = new NewPagesPager( $this, $this->opts );