X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fuser%2FUser.php;h=390c4b810575f5529917d7c8726319bc02f22797;hb=4182a9001e32819d83e8cda4209d07cb6860267f;hp=a4dfb2bba8e87289d7dee83e571e22eb35ef47e9;hpb=1d235419d7a6059158b30f62eedc26cf5324b500;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/user/User.php b/includes/user/User.php
index a4dfb2bba8..390c4b8105 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -179,7 +179,6 @@ class User implements IDBAccessObject, UserIdentity {
 		'reupload-shared',
 		'rollback',
 		'sendemail',
-		'sendemail-new-users',
 		'siteadmin',
 		'suppressionlog',
 		'suppressredirect',
@@ -234,7 +233,7 @@ class User implements IDBAccessObject, UserIdentity {
 	 * @deprecated since 1.29
 	 */
 	private $mGroups;
-	/** @var array Associative array of (group name => UserGroupMembership object) */
+	/** @var UserGroupMembership[] Associative array of (group name => UserGroupMembership object) */
 	protected $mGroupMemberships;
 	/** @var array */
 	protected $mOptionOverrides;
@@ -3089,12 +3088,13 @@ class User implements IDBAccessObject, UserIdentity {
 			$options = $this->mOptions;
 		}
 
-		$prefs = Preferences::getPreferences( $this, $context );
+		$preferencesFactory = MediaWikiServices::getInstance()->getPreferencesFactory();
+		$prefs = $preferencesFactory->getFormDescriptor( $this, $context );
 		$mapping = [];
 
 		// Pull out the "special" options, so they don't get converted as
 		// multiselect or checkmatrix.
-		$specialOptions = array_fill_keys( Preferences::getSaveBlacklist(), true );
+		$specialOptions = array_fill_keys( $preferencesFactory->getSaveBlacklist(), true );
 		foreach ( $specialOptions as $name => $value ) {
 			unset( $prefs[$name] );
 		}
@@ -3317,7 +3317,7 @@ class User implements IDBAccessObject, UserIdentity {
 	 * Get the list of explicit group memberships this user has, stored as
 	 * UserGroupMembership objects. Implicit groups are not included.
 	 *
-	 * @return array Associative array of (group name as string => UserGroupMembership object)
+	 * @return UserGroupMembership[] Associative array of (group name => UserGroupMembership object)
 	 * @since 1.29
 	 */
 	public function getGroupMemberships() {