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 "Don't check namespace in SpecialWantedtemplates"
[lhc/web/wiklou.git]
/
includes
/
specials
/
SpecialChangeEmail.php
diff --git
a/includes/specials/SpecialChangeEmail.php
b/includes/specials/SpecialChangeEmail.php
index
eca307d
..
c2aa704
100644
(file)
--- a/
includes/specials/SpecialChangeEmail.php
+++ b/
includes/specials/SpecialChangeEmail.php
@@
-92,14
+92,14
@@
class SpecialChangeEmail extends FormSpecialPage {
'NewEmail' => array(
'type' => 'email',
'label-message' => 'changeemail-newemail',
'NewEmail' => array(
'type' => 'email',
'label-message' => 'changeemail-newemail',
+ 'autofocus' => true
),
);
if ( $this->getConfig()->get( 'RequirePasswordforEmailChange' ) ) {
$fields['Password'] = array(
'type' => 'password',
),
);
if ( $this->getConfig()->get( 'RequirePasswordforEmailChange' ) ) {
$fields['Password'] = array(
'type' => 'password',
- 'label-message' => 'changeemail-password',
- 'autofocus' => true,
+ 'label-message' => 'changeemail-password'
);
}
);
}
@@
-107,7
+107,7
@@
class SpecialChangeEmail extends FormSpecialPage {
}
protected function getDisplayFormat() {
}
protected function getDisplayFormat() {
- return '
vform
';
+ return '
ooui
';
}
protected function alterForm( HTMLForm $form ) {
}
protected function alterForm( HTMLForm $form ) {
@@
-129,7
+129,8
@@
class SpecialChangeEmail extends FormSpecialPage {
public function onSuccess() {
$request = $this->getRequest();
public function onSuccess() {
$request = $this->getRequest();
- $titleObj = Title::newFromText( $request->getVal( 'returnto' ) );
+ $returnto = $request->getVal( 'returnto' );
+ $titleObj = $returnto !== null ? Title::newFromText( $returnto ) : null;
if ( !$titleObj instanceof Title ) {
$titleObj = Title::newMainPage();
}
if ( !$titleObj instanceof Title ) {
$titleObj = Title::newMainPage();
}