| Index: trunk/phase3/includes/specials/SpecialEmailuser.php |
| — | — | @@ -117,7 +117,7 @@ |
| 118 | 118 | $ret = ( $ret == 'notarget' ) ? 'emailnotarget' : ( $ret . 'text' ); |
| 119 | 119 | $out->addHTML( '<p class="error">' . wfMessage( $ret )->parse() . '</p>' ); |
| 120 | 120 | } |
| 121 | | - $out->addHTML( self::userForm( $this->mTarget ) ); |
| | 121 | + $out->addHTML( $this->userForm( $this->mTarget ) ); |
| 122 | 122 | return false; |
| 123 | 123 | } |
| 124 | 124 | |
| — | — | @@ -219,17 +219,16 @@ |
| 220 | 220 | * @param $name String: user name submitted. |
| 221 | 221 | * @return String: form asking for user name. |
| 222 | 222 | */ |
| 223 | | - |
| 224 | | - function userForm( $name ) { |
| 225 | | - global $wgScript ; |
| | 223 | + protected function userForm( $name ) { |
| | 224 | + global $wgScript; |
| 226 | 225 | $string = Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript, 'id' => 'askusername' ) ) . |
| 227 | | - Html::hidden( 'title', $this->getTitle()->getPrefixedText() ) . |
| 228 | | - Xml::openElement( 'fieldset' ) . |
| 229 | | - Html::rawElement( 'legend', null, wfMessage( 'emailtarget' )->parse() ) . |
| 230 | | - Xml::inputLabel( wfMessage( 'emailusername' )->text(), 'target', 'emailusertarget', 30, $name ) . ' ' . |
| 231 | | - Xml::submitButton( wfMessage( 'emailusernamesubmit' )->text() ) . |
| 232 | | - Xml::closeElement( 'fieldset' ) . |
| 233 | | - Xml::closeElement( 'form' ) . "\n"; |
| | 226 | + Html::hidden( 'title', $this->getTitle()->getPrefixedText() ) . |
| | 227 | + Xml::openElement( 'fieldset' ) . |
| | 228 | + Html::rawElement( 'legend', null, wfMessage( 'emailtarget' )->parse() ) . |
| | 229 | + Xml::inputLabel( wfMessage( 'emailusername' )->text(), 'target', 'emailusertarget', 30, $name ) . ' ' . |
| | 230 | + Xml::submitButton( wfMessage( 'emailusernamesubmit' )->text() ) . |
| | 231 | + Xml::closeElement( 'fieldset' ) . |
| | 232 | + Xml::closeElement( 'form' ) . "\n"; |
| 234 | 233 | return $string; |
| 235 | 234 | } |
| 236 | 235 | |