From: umherirrender <umherirrender_de.wp@web.de>
Date: Fri, 27 Jun 2014 14:57:30 +0000 (+0200)
Subject: Remove OutputPage::getStatusMessage() (deprecated since 1.18)
X-Git-Tag: 1.31.0-rc.0~15045
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/journal.php?a=commitdiff_plain;h=b18d8d7e0119858c461790aafcc2a5ebea2e67ef;p=lhc%2Fweb%2Fwiklou.git

Remove OutputPage::getStatusMessage() (deprecated since 1.18)

Also removed a comment where the method was mentioned.

Change-Id: I802f0f41e107a1d677fb899f6e09ea31df3c4e6f
---

diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24
index a099eff045..5858739f60 100644
--- a/RELEASE-NOTES-1.24
+++ b/RELEASE-NOTES-1.24
@@ -218,6 +218,7 @@ changes to languages because of Bugzilla reports.
 * Removed Skin::makeGlobalVariablesScript. (deprecated since 1.19)
 * Removed MWNamespace::isMain(). (deprecated since 1.19)
 * Removed Preferences::loadOldSearchNs(). (deprecated since 1.19)
+* Removed OutputPage::getStatusMessage(). (deprecated since 1.18)
 
 ==== Renamed classes ====
 * CLDRPluralRuleConverter_Expression to CLDRPluralRuleConverterExpression
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 62f3c13c23..b1a3ad51ac 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2066,19 +2066,6 @@ class OutputPage extends ContextSource {
 		}
 	}
 
-	/**
-	 * Get the message associated with the HTTP response code $code
-	 *
-	 * @param int $code Status code
-	 * @return string|null Message or null if $code is not in the list of messages
-	 *
-	 * @deprecated since 1.18 Use HttpStatus::getMessage() instead.
-	 */
-	public static function getStatusMessage( $code ) {
-		wfDeprecated( __METHOD__, '1.18' );
-		return HttpStatus::getMessage( $code );
-	}
-
 	/**
 	 * Finally, all the text has been munged and accumulated into
 	 * the object, let's actually output it:
diff --git a/includes/libs/HttpStatus.php b/includes/libs/HttpStatus.php
index d72ffcabb0..809bfdf5a8 100644
--- a/includes/libs/HttpStatus.php
+++ b/includes/libs/HttpStatus.php
@@ -28,8 +28,6 @@ class HttpStatus {
 	/**
 	 * Get the message associated with HTTP response code $code
 	 *
-	 * Replace OutputPage::getStatusMessage( $code )
-	 *
 	 * @param $code Integer: status code
 	 * @return String or null: message or null if $code is not in the list of
 	 *         messages