| Index: trunk/phase3/includes/templates/Userlogin.php |
| — | — | @@ -67,7 +67,7 @@ |
| 68 | 68 | |
| 69 | 69 | </td> |
| 70 | 70 | </tr> |
| 71 | | - <?php if( $this->data['usedomain'] ) { |
| | 71 | + <?php if( isset( $this->data['usedomain'] ) && $this->data['usedomain'] ) { |
| 72 | 72 | $doms = ""; |
| 73 | 73 | foreach( $this->data['domainnames'] as $dom ) { |
| 74 | 74 | $doms .= "<option>" . htmlspecialchars( $dom ) . "</option>"; |
| — | — | @@ -83,6 +83,11 @@ |
| 84 | 84 | </td> |
| 85 | 85 | </tr> |
| 86 | 86 | <?php } |
| | 87 | + |
| | 88 | + if( $this->haveData( 'extrafields' ) ) { |
| | 89 | + echo $this->data['extrafields']; |
| | 90 | + } |
| | 91 | + |
| 87 | 92 | if( $this->data['canremember'] ) { ?> |
| 88 | 93 | <tr> |
| 89 | 94 | <td></td> |
| — | — | @@ -94,7 +99,7 @@ |
| 95 | 100 | 'wpRemember', |
| 96 | 101 | 'wpRemember', |
| 97 | 102 | $this->data['remember'], |
| 98 | | - array( 'tabindex' => '4' ) |
| | 103 | + array( 'tabindex' => '8' ) |
| 99 | 104 | ) |
| 100 | 105 | ?> |
| 101 | 106 | </td> |
| — | — | @@ -106,13 +111,13 @@ |
| 107 | 112 | <?php |
| 108 | 113 | echo Html::input( 'wpLoginAttempt', wfMsg( 'login' ), 'submit', array( |
| 109 | 114 | 'id' => 'wpLoginAttempt', |
| 110 | | - 'tabindex' => '5' |
| | 115 | + 'tabindex' => '9' |
| 111 | 116 | ) ); |
| 112 | 117 | if ( $this->data['useemail'] && $this->data['canreset'] ) { |
| 113 | 118 | echo ' '; |
| 114 | 119 | echo Html::input( 'wpMailmypassword', wfMsg( 'mailmypassword' ), 'submit', array( |
| 115 | 120 | 'id' => 'wpMailmypassword', |
| 116 | | - 'tabindex' => '6' |
| | 121 | + 'tabindex' => '10' |
| 117 | 122 | ) ); |
| 118 | 123 | } ?> |
| 119 | 124 | |