X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FPreferences.php;h=6d379dcb497a5506af713ad7559a77f46d1640c1;hb=6e04121078d56b05dcc5906a1d4bd07dce4f1f42;hp=c458af0eaba296b18bf637f7f6ea30245fd654a4;hpb=5623d4c64319a98ddd8263c597002d173464ccbf;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Preferences.php b/includes/Preferences.php
index c458af0eab..6d379dcb49 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -35,12 +35,13 @@ 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;
 	}
@@ -300,30 +301,6 @@ class Preferences {
 		throw new Exception( __METHOD__ . '() is deprecated and does nothing' );
 	}
 
-	/**
-	 * Handle the form submission if everything validated properly
-	 *
-	 * @deprecated since 1.31, use PreferencesFactory
-	 *
-	 * @param array $formData
-	 * @param HTMLForm $form
-	 * @return bool|Status|string
-	 */
-	public static function tryFormSubmit( $formData, $form ) {
-		$preferencesFactory = self::getDefaultPreferencesFactory();
-		return $preferencesFactory->legacySaveFormData( $formData, $form );
-	}
-
-	/**
-	 * @param array $formData
-	 * @param HTMLForm $form
-	 * @return Status
-	 */
-	public static function tryUISubmit( $formData, $form ) {
-		$preferencesFactory = self::getDefaultPreferencesFactory();
-		return $preferencesFactory->legacySubmitForm( $formData, $form );
-	}
-
 	/**
 	 * Get a list of all time zones
 	 * @param Language $language Language used for the localized names