X-Git-Url: http://git.cyclocoop.org/%28?a=blobdiff_plain;f=includes%2FPreferences.php;h=70f70609ae8c6ea3f867a9da13f69ea08bc402bd;hb=4d5a6ab95157f97cb8faffcfa7ce0b0eb0194900;hp=a8a312c3bdbfa5718cb1d25778acbcadc9aa159b;hpb=f506a05aaa035b96537b33244b0f18b093048e97;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Preferences.php b/includes/Preferences.php
index a8a312c3bd..70f70609ae 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -35,23 +35,17 @@ class Preferences {
 	 * @return DefaultPreferencesFactory
 	 */
 	protected static function getDefaultPreferencesFactory() {
-		global $wgContLang;
+		$services = MediaWikiServices::getInstance();
 		$authManager = AuthManager::singleton();
-		$linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer();
-		$config = MediaWikiServices::getInstance()->getMainConfig();
+		$linkRenderer = $services->getLinkRenderer();
+		$config = $services->getMainConfig();
 		$preferencesFactory = new DefaultPreferencesFactory(
-			$config, $wgContLang, $authManager, $linkRenderer
+			$config, $services->getContentLanguage(), $authManager,
+			$linkRenderer
 		);
 		return $preferencesFactory;
 	}
 
-	/**
-	 * @return array
-	 */
-	public static function getSaveBlacklist() {
-		throw new Exception( __METHOD__ . '() is deprecated and does nothing' );
-	}
-
 	/**
 	 * @throws MWException
 	 * @param User $user
@@ -59,6 +53,7 @@ class Preferences {
 	 * @return array|null
 	 */
 	public static function getPreferences( $user, IContextSource $context ) {
+		wfDeprecated( __METHOD__, '1.31' );
 		$preferencesFactory = self::getDefaultPreferencesFactory();
 		return $preferencesFactory->getFormDescriptor( $user, $context );
 	}
@@ -201,6 +196,7 @@ class Preferences {
 	 * @param array &$defaultPreferences
 	 */
 	public static function miscPreferences( $user, IContextSource $context, &$defaultPreferences ) {
+		wfDeprecated( __METHOD__, '1.31' );
 	}
 
 	/**
@@ -270,45 +266,8 @@ class Preferences {
 		$formClass = PreferencesFormLegacy::class,
 		array $remove = []
 	) {
+		wfDeprecated( __METHOD__, '1.31' );
 		$preferencesFactory = self::getDefaultPreferencesFactory();
 		return $preferencesFactory->getForm( $user, $context, $formClass, $remove );
 	}
-
-	/**
-	 * @param IContextSource $context
-	 * @return array
-	 */
-	public static function getTimezoneOptions( IContextSource $context ) {
-		throw new Exception( __METHOD__ . '() is deprecated and does nothing' );
-	}
-
-	/**
-	 * @param string $value
-	 * @param array $alldata
-	 * @return int
-	 */
-	public static function filterIntval( $value, $alldata ) {
-		throw new Exception( __METHOD__ . '() is deprecated and does nothing' );
-	}
-
-	/**
-	 * @param string $tz
-	 * @param array $alldata
-	 * @return string
-	 */
-	public static function filterTimezoneInput( $tz, $alldata ) {
-		throw new Exception( __METHOD__ . '() is deprecated and does nothing' );
-	}
-
-	/**
-	 * Get a list of all time zones
-	 * @param Language $language Language used for the localized names
-	 * @return array A list of all time zones. The system name of the time zone is used as key and
-	 *  the value is an array which contains localized name, the timecorrection value used for
-	 *  preferences and the region
-	 * @since 1.26
-	 */
-	public static function getTimeZoneList( Language $language ) {
-		throw new Exception( __METHOD__ . '() is deprecated and does nothing' );
-	}
 }