From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Thu, 1 Jul 2010 07:30:55 +0000 (+0000)
Subject: Don't add confusing new lines to debug output, mark deprecated method
X-Git-Tag: 1.31.0-rc.0~36322
X-Git-Url: https://git.cyclocoop.org/?a=commitdiff_plain;h=f4b082cbe8720c45e8a0bbe98cc76ca535594296;p=lhc%2Fweb%2Fwiklou.git

Don't add confusing new lines to debug output, mark deprecated method
---

diff --git a/includes/SpecialPage.php b/includes/SpecialPage.php
index 2bc123c527..f76966a449 100644
--- a/includes/SpecialPage.php
+++ b/includes/SpecialPage.php
@@ -308,8 +308,10 @@ class SpecialPage {
 	 * an associative record to $wgSpecialPages. This avoids autoloading SpecialPage.
 	 *
 	 * @param $page SpecialPage
+	 * Deprecated in 1.7, warnings in 1.17, might be removed in 1.20
 	 */
 	static function addPage( &$page ) {
+		wfDeprecated( __METHOD__ );
 		if ( !self::$mListInitialised ) {
 			self::initList();
 		}
@@ -624,16 +626,16 @@ class SpecialPage {
 			$found = false;
 			foreach ( $aliases as $n => $values ) {
 				if ( strcasecmp( $name, $n ) === 0 ) {
-					wfWarn( "Found alias defined for $n when searching for special page aliases
-for $name. Case mismatch?" );
+					wfWarn( "Found alias defined for $n when searching for" .
+						"special page aliases for $name. Case mismatch?" );
 					$name = $values[0];
 					$found = true;
 					break;
 				}
 			}
 			if ( !$found ) {
-				wfWarn( "Did not find alias for special page '$name'.
-Perhaps no page aliases are defined for it?" );
+				wfWarn( "Did not find alias for special page '$name'." . 
+					"Perhaps no aliases are defined for it?" );
 			}
 		}
 		if ( $subpage !== false && !is_null( $subpage ) ) {