X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FPreferences.php;h=cbef6f414786985d0d650ba6130eee8725b659f1;hb=6cc7c3e09f2f22a9eb7a54f9bfe5edfa90c19316;hp=b8947c9c919af4a1c97df6b139cefe3b4e1d29a1;hpb=6341ae34b695fc3df1fb1d8b4034348acbcd7221;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Preferences.php b/includes/Preferences.php
index b8947c9c91..cbef6f4147 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -35,8 +35,6 @@ class Preferences {
 		if ( self::$defaultPreferences )
 			return self::$defaultPreferences;
 
-		global $wgRCMaxAge;
-
 		$defaultPreferences = array();
 
 		self::profilePreferences( $user, $defaultPreferences );
@@ -62,7 +60,6 @@ class Preferences {
 		}
 
 		## Prod in defaults from the user
-		global $wgDefaultUserOptions;
 		foreach ( $defaultPreferences as $name => &$info ) {
 			$prefFromUser = self::getOptionFromUser( $name, $info, $user );
 			$field = HTMLForm::loadInputFromParameters( $info ); // For validation
@@ -232,7 +229,7 @@ class Preferences {
 
 		// Language
 		global $wgContLanguageCode;
-		$languages = array_reverse( Language::getLanguageNames( false ) );
+		$languages = Language::getLanguageNames( false );
 		if ( !array_key_exists( $wgContLanguageCode, $languages ) ) {
 			$languages[$wgContLanguageCode] = $wgContLanguageCode;
 		}
@@ -474,8 +471,6 @@ class Preferences {
 
 		$selectedSkin = $user->getOption( 'skin' );
 		if ( in_array( $selectedSkin, array( 'cologneblue', 'standard' ) ) ) {
-			global $wgLang;
-
 			$settings = array_flip( $wgLang->getQuickbarSettings() );
 
 			$defaultPreferences['quickbar'] = array(
@@ -588,8 +583,8 @@ class Preferences {
 			);
 		}
 
-		$stubThresholdValues = array( 0, 50, 100, 500, 1000, 2000, 5000, 10000 );
-		$stubThresholdOptions = array();
+		$stubThresholdValues = array( 50, 100, 500, 1000, 2000, 5000, 10000 );
+		$stubThresholdOptions = array( wfMsg( 'stub-threshold-disabled' ) => 0 );
 		foreach ( $stubThresholdValues as $value ) {
 			$stubThresholdOptions[wfMsg( 'size-bytes', $value )] = $value;
 		}
@@ -710,11 +705,6 @@ class Preferences {
 			'section' => 'editing/advancedediting',
 			'label-message' => 'tog-showtoolbar',
 		);
-		$defaultPreferences['minordefault'] = array(
-			'type' => 'toggle',
-			'section' => 'editing/advancedediting',
-			'label-message' => 'tog-minordefault',
-		);
 
 		if ( $wgUseExternalEditor ) {
 			$defaultPreferences['externaleditor'] = array(
@@ -1150,9 +1140,9 @@ class Preferences {
 		return true;
 	}
 
-	static function getFormObject( $user ) {
+	static function getFormObject( $user, $formClass = 'PreferencesForm' ) {
 		$formDescriptor = Preferences::getPreferences( $user );
-		$htmlForm = new PreferencesForm( $formDescriptor, 'prefs' );
+		$htmlForm = new $formClass( $formDescriptor, 'prefs' );
 
 		$htmlForm->setSubmitText( wfMsg( 'saveprefs' ) );
 		# Used message keys: 'accesskey-preferences-save', 'tooltip-preferences-save'