| Index: trunk/extensions/ConfirmAccount/ConfirmAccount_body.php |
| — | — | @@ -26,13 +26,14 @@ |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | $this->setHeaders(); |
| | 30 | + |
| | 31 | + $this->mRealName = $wgRequest->getText( 'wpRealName' ); |
| 30 | 32 | # We may only want real names being used |
| 31 | 33 | if( $wgUseRealNamesOnly ) |
| 32 | | - $this->mUsername = $wgRequest->getText( 'wpRealName' ); |
| | 34 | + $this->mUsername = $this->mRealName; |
| 33 | 35 | else |
| 34 | 36 | $this->mUsername = $wgRequest->getText( 'wpUsername' ); |
| 35 | | - # Grab other info fields... |
| 36 | | - $this->mRealName = $wgRequest->getText( 'wpRealName' ); |
| | 37 | + # Other fields... |
| 37 | 38 | $this->mEmail = $wgRequest->getText( 'wpEmail' ); |
| 38 | 39 | $this->mBio = $wgRequest->getText( 'wpBio', '' ); |
| 39 | 40 | $this->mNotes = $wgRequest->getText( 'wpNotes', '' ); |
| — | — | @@ -691,7 +692,7 @@ |
| 692 | 693 | } |
| 693 | 694 | |
| 694 | 695 | function formatRow( $row ) { |
| 695 | | - global $wgLang, $wgUser; |
| | 696 | + global $wgLang, $wgUser, $wgUseRealNamesOnly; |
| 696 | 697 | |
| 697 | 698 | $title = SpecialPage::getTitleFor( 'ConfirmAccounts' ); |
| 698 | 699 | if( $this->showRejects ) { |
| — | — | @@ -709,8 +710,10 @@ |
| 710 | 711 | $r .= ' <b>'.wfMsgExt( 'confirmaccount-reject', array('parseinline'), $row->user_name, $time ).'</b>'; |
| 711 | 712 | } |
| 712 | 713 | $r .= '<br/><table cellspacing=\'1\' cellpadding=\'3\' border=\'1\' width=\'100%\'>'; |
| 713 | | - $r .= '<tr><td><strong>'.wfMsgHtml('confirmaccount-name').'</strong></td><td width=\'100%\'>' . |
| 714 | | - htmlspecialchars($row->acr_name) . '</td></tr>'; |
| | 714 | + if( !$wgUseRealNamesOnly ) { |
| | 715 | + $r .= '<tr><td><strong>'.wfMsgHtml('confirmaccount-name').'</strong></td><td width=\'100%\'>' . |
| | 716 | + htmlspecialchars($row->acr_name) . '</td></tr>'; |
| | 717 | + } |
| 715 | 718 | $r .= '<tr><td><strong>'.wfMsgHtml('confirmaccount-real').'</strong></td><td width=\'100%\'>' . |
| 716 | 719 | htmlspecialchars($row->acr_real_name) . '</td></tr>'; |
| 717 | 720 | $econf = $row->acr_email_authenticated ? ' <strong>'.wfMsg('confirmaccount-econf').'</strong>' : ''; |