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 "Explicitly mark HTMLCacheUpdateJob jobs that are recursive for clarity"
[lhc/web/wiklou.git]
/
includes
/
templates
/
Usercreate.php
diff --git
a/includes/templates/Usercreate.php
b/includes/templates/Usercreate.php
index
d435615
..
dc9da63
100644
(file)
--- a/
includes/templates/Usercreate.php
+++ b/
includes/templates/Usercreate.php
@@
-53,7
+53,7
@@
class UsercreateTemplate extends BaseTemplate {
<div id="userloginForm">
<form name="userlogin2" id="userlogin2" class="mw-ui-vform" method="post" action="<?php $this->text( 'action' ); ?>">
<section class="mw-form-header">
<div id="userloginForm">
<form name="userlogin2" id="userlogin2" class="mw-ui-vform" method="post" action="<?php $this->text( 'action' ); ?>">
<section class="mw-form-header">
- <?php $this->html( 'header' );
/* extensions such as ConfirmEdit add form HTML here */
?>
+ <?php $this->html( 'header' ); ?>
</section>
<!-- This element is used by the mediawiki.special.userlogin.signup.js module. -->
<div
</section>
<!-- This element is used by the mediawiki.special.userlogin.signup.js module. -->
<div
@@
-217,8
+217,10
@@
class UsercreateTemplate extends BaseTemplate {
<?php if ( !empty( $inputItem['value'] ) ) {
echo 'checked="checked"';
} ?>
<?php if ( !empty( $inputItem['value'] ) ) {
echo 'checked="checked"';
} ?>
- ><label for="<?php echo htmlspecialchars( $inputItem['name'] ); ?>"></label>
- </div><?php $this->msgHtml( $inputItem['msg'] ); ?>
+ ><label for="<?php echo htmlspecialchars( $inputItem['name'] ); ?>">
+ <?php $this->msg( $inputItem['msg'] ); ?>
+ </label>
+ </div>
<?php
} else {
// Not a checkbox.
<?php
} else {
// Not a checkbox.
@@
-248,8
+250,11
@@
class UsercreateTemplate extends BaseTemplate {
}
}
}
}
- // JS attempts to move the image CAPTCHA below this part of the form,
- // so skip one index.
+ // A separate placeholder for any inserting any extrafields, e.g used by ConfirmEdit extension
+ if ( $this->haveData( 'extrafields' ) ) {
+ echo $this->data['extrafields'];
+ }
+ // skip one index.
$tabIndex++;
?>
<div class="mw-ui-vform-field mw-submit">
$tabIndex++;
?>
<div class="mw-ui-vform-field mw-submit">
@@
-258,10
+263,10
@@
class UsercreateTemplate extends BaseTemplate {
$this->getMsg( $this->data['loggedin'] ? 'createacct-another-submit' : 'createacct-submit' ),
$attrs = array(
'id' => 'wpCreateaccount',
$this->getMsg( $this->data['loggedin'] ? 'createacct-another-submit' : 'createacct-submit' ),
$attrs = array(
'id' => 'wpCreateaccount',
+ 'name' => 'wpCreateaccount',
'tabindex' => $tabIndex++
),
array(
'tabindex' => $tabIndex++
),
array(
- 'mw-ui-big',
'mw-ui-block',
'mw-ui-constructive',
)
'mw-ui-block',
'mw-ui-constructive',
)