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
Merge "RCFilters: Make extra filters footer non-sticky"
[lhc/web/wiklou.git]
/
includes
/
specials
/
SpecialEmailuser.php
diff --git
a/includes/specials/SpecialEmailuser.php
b/includes/specials/SpecialEmailuser.php
index
085b68d
..
830b438
100644
(file)
--- a/
includes/specials/SpecialEmailuser.php
+++ b/
includes/specials/SpecialEmailuser.php
@@
-231,14
+231,15
@@
class SpecialEmailUser extends UnlistedSpecialPage {
return 'usermaildisabled';
}
return 'usermaildisabled';
}
- if ( !$user->isAllowed( 'sendemail' ) ) {
- return 'badaccess';
- }
-
+ // Run this before $user->isAllowed, to show appropriate message to anons (T160309)
if ( !$user->isEmailConfirmed() ) {
return 'mailnologin';
}
if ( !$user->isEmailConfirmed() ) {
return 'mailnologin';
}
+ if ( !$user->isAllowed( 'sendemail' ) ) {
+ return 'badaccess';
+ }
+
if ( $user->isBlockedFromEmailuser() ) {
wfDebug( "User is blocked from sending e-mail.\n" );
if ( $user->isBlockedFromEmailuser() ) {
wfDebug( "User is blocked from sending e-mail.\n" );
@@
-288,7
+289,7
@@
class SpecialEmailUser extends UnlistedSpecialPage {
'text',
[
'id' => 'emailusertarget',
'text',
[
'id' => 'emailusertarget',
- 'class' => 'mw-autocomplete-user',
// used by mediawiki.userSuggest
+ 'class' => 'mw-autocomplete-user', // used by mediawiki.userSuggest
'autofocus' => true,
'size' => 30,
]
'autofocus' => true,
'size' => 30,
]