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 "(bug 39793) #simpleSearch placeholder styles for Firefox, IE"
[lhc/web/wiklou.git]
/
includes
/
specials
/
SpecialUserlogin.php
diff --git
a/includes/specials/SpecialUserlogin.php
b/includes/specials/SpecialUserlogin.php
index
c101897
..
ef6af80
100644
(file)
--- a/
includes/specials/SpecialUserlogin.php
+++ b/
includes/specials/SpecialUserlogin.php
@@
-464,8
+464,7
@@
class LoginForm extends SpecialPage {
$u->saveSettings();
# Update user count
$u->saveSettings();
# Update user count
- $ssUpdate = new SiteStatsUpdate( 0, 0, 0, 0, 1 );
- $ssUpdate->doUpdate();
+ DeferredUpdates::addUpdate( new SiteStatsUpdate( 0, 0, 0, 0, 1 ) );
return $u;
}
return $u;
}
@@
-833,7
+832,7
@@
class LoginForm extends SpecialPage {
$u->setNewpassword( $np, $throttle );
$u->saveSettings();
$userLanguage = $u->getOption( 'language' );
$u->setNewpassword( $np, $throttle );
$u->saveSettings();
$userLanguage = $u->getOption( 'language' );
- $m = $this->msg( $emailText, $ip, $u->getName(), $np,
$wgServer . $wgScript
,
+ $m = $this->msg( $emailText, $ip, $u->getName(), $np,
'<' . $wgServer . $wgScript . '>'
,
round( $wgNewPasswordExpiry / 86400 ) )->inLanguage( $userLanguage )->text();
$result = $u->sendMail( $this->msg( $emailTitle )->inLanguage( $userLanguage )->text(), $m );
round( $wgNewPasswordExpiry / 86400 ) )->inLanguage( $userLanguage )->text();
$result = $u->sendMail( $this->msg( $emailTitle )->inLanguage( $userLanguage )->text(), $m );