X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FPreferences.php;h=0bb1d28af378647f413030f873c8b2c1820b5ed9;hb=f1c7c0f03da1607dc955dc8db879a16fc0575657;hp=c64e8a8ae1ef682433bb19a3ae7b3ae59f89eb89;hpb=802c199d0bd80ff0f4d730c61fd58cbf08a52d8d;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Preferences.php b/includes/Preferences.php
index c64e8a8ae1..0bb1d28af3 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * Form to edit user preferences.
- *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -958,6 +956,15 @@ class Preferences {
 				'label-message' => 'tog-shownumberswatching',
 			];
 		}
+
+		if ( $config->get( 'StructuredChangeFiltersShowPreference' ) ) {
+			$defaultPreferences['rcenhancedfilters-disable'] = [
+				'type' => 'toggle',
+				'section' => 'rc/advancedrc',
+				'label-message' => 'rcfilters-preference-label',
+				'help-message' => 'rcfilters-preference-help',
+			];
+		}
 	}
 
 	/**
@@ -1626,123 +1633,3 @@ class Preferences {
 		return $timeZoneList;
 	}
 }
-
-/** Some tweaks to allow js prefs to work */
-class PreferencesForm extends HTMLForm {
-	// Override default value from HTMLForm
-	protected $mSubSectionBeforeFields = false;
-
-	private $modifiedUser;
-
-	/**
-	 * @param User $user
-	 */
-	public function setModifiedUser( $user ) {
-		$this->modifiedUser = $user;
-	}
-
-	/**
-	 * @return User
-	 */
-	public function getModifiedUser() {
-		if ( $this->modifiedUser === null ) {
-			return $this->getUser();
-		} else {
-			return $this->modifiedUser;
-		}
-	}
-
-	/**
-	 * Get extra parameters for the query string when redirecting after
-	 * successful save.
-	 *
-	 * @return array
-	 */
-	public function getExtraSuccessRedirectParameters() {
-		return [];
-	}
-
-	/**
-	 * @param string $html
-	 * @return string
-	 */
-	function wrapForm( $html ) {
-		$html = Xml::tags( 'div', [ 'id' => 'preferences' ], $html );
-
-		return parent::wrapForm( $html );
-	}
-
-	/**
-	 * @return string
-	 */
-	function getButtons() {
-		$attrs = [ 'id' => 'mw-prefs-restoreprefs' ];
-
-		if ( !$this->getModifiedUser()->isAllowedAny( 'editmyprivateinfo', 'editmyoptions' ) ) {
-			return '';
-		}
-
-		$html = parent::getButtons();
-
-		if ( $this->getModifiedUser()->isAllowed( 'editmyoptions' ) ) {
-			$t = $this->getTitle()->getSubpage( 'reset' );
-
-			$linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer();
-			$html .= "\n" . $linkRenderer->makeLink( $t, $this->msg( 'restoreprefs' )->text(),
-				Html::buttonAttributes( $attrs, [ 'mw-ui-quiet' ] ) );
-
-			$html = Xml::tags( 'div', [ 'class' => 'mw-prefs-buttons' ], $html );
-		}
-
-		return $html;
-	}
-
-	/**
-	 * Separate multi-option preferences into multiple preferences, since we
-	 * have to store them separately
-	 * @param array $data
-	 * @return array
-	 */
-	function filterDataForSubmit( $data ) {
-		foreach ( $this->mFlatFields as $fieldname => $field ) {
-			if ( $field instanceof HTMLNestedFilterable ) {
-				$info = $field->mParams;
-				$prefix = isset( $info['prefix'] ) ? $info['prefix'] : $fieldname;
-				foreach ( $field->filterDataForSubmit( $data[$fieldname] ) as $key => $value ) {
-					$data["$prefix$key"] = $value;
-				}
-				unset( $data[$fieldname] );
-			}
-		}
-
-		return $data;
-	}
-
-	/**
-	 * Get the whole body of the form.
-	 * @return string
-	 */
-	function getBody() {
-		return $this->displaySection( $this->mFieldTree, '', 'mw-prefsection-' );
-	}
-
-	/**
-	 * Get the "<legend>" for a given section key. Normally this is the
-	 * prefs-$key message but we'll allow extensions to override it.
-	 * @param string $key
-	 * @return string
-	 */
-	function getLegend( $key ) {
-		$legend = parent::getLegend( $key );
-		Hooks::run( 'PreferencesGetLegend', [ $this, $key, &$legend ] );
-		return $legend;
-	}
-
-	/**
-	 * Get the keys of each top level preference section.
-	 * @return array of section keys
-	 */
-	function getPreferenceSections() {
-		return array_keys( array_filter( $this->mFieldTree, 'is_array' ) );
-	}
-}