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 "jquery.tablesorter: use of expand-child class"
[lhc/web/wiklou.git]
/
includes
/
specials
/
SpecialPasswordReset.php
diff --git
a/includes/specials/SpecialPasswordReset.php
b/includes/specials/SpecialPasswordReset.php
index
8cad616
..
f1eb8c2
100644
(file)
--- a/
includes/specials/SpecialPasswordReset.php
+++ b/
includes/specials/SpecialPasswordReset.php
@@
-58,7
+58,7
@@
class SpecialPasswordReset extends FormSpecialPage {
throw new ErrorPageError( 'internalerror', 'resetpass_forbidden' );
}
throw new ErrorPageError( 'internalerror', 'resetpass_forbidden' );
}
-
return
parent::checkExecutePermissions( $user );
+ parent::checkExecutePermissions( $user );
}
protected function getFormFields() {
}
protected function getFormFields() {
@@
-271,7
+271,7
@@
class SpecialPasswordReset extends FormSpecialPage {
round( $this->getConfig()->get( 'NewPasswordExpiry' ) / 86400 )
);
round( $this->getConfig()->get( 'NewPasswordExpiry' ) / 86400 )
);
- $title = $this->msg( 'passwordreset-emailtitle' );
+ $title = $this->msg( 'passwordreset-emailtitle' )
->inLanguage( $userLanguage )
;
$this->result = $firstUser->sendMail( $title->text(), $this->email->text() );
$this->result = $firstUser->sendMail( $title->text(), $this->email->text() );