dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Prevent new users from being sent emails"
[lhc/web/wiklou.git]
/
includes
/
user
/
User.php
diff --git
a/includes/user/User.php
b/includes/user/User.php
index
a4dfb2b
..
390c4b8
100644
(file)
--- a/
includes/user/User.php
+++ b/
includes/user/User.php
@@
-179,7
+179,6
@@
class User implements IDBAccessObject, UserIdentity {
'reupload-shared',
'rollback',
'sendemail',
'reupload-shared',
'rollback',
'sendemail',
- 'sendemail-new-users',
'siteadmin',
'suppressionlog',
'suppressredirect',
'siteadmin',
'suppressionlog',
'suppressredirect',
@@
-234,7
+233,7
@@
class User implements IDBAccessObject, UserIdentity {
* @deprecated since 1.29
*/
private $mGroups;
* @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;
protected $mGroupMemberships;
/** @var array */
protected $mOptionOverrides;
@@
-3089,12
+3088,13
@@
class User implements IDBAccessObject, UserIdentity {
$options = $this->mOptions;
}
$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.
$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] );
}
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.
*
* 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() {
* @since 1.29
*/
public function getGroupMemberships() {