| Index: trunk/extensions/CentralAuth/specials/SpecialCentralAuth.php |
| — | — | @@ -292,18 +292,19 @@ |
| 293 | 293 | $age = $this->prettyTimespan( wfTimestamp( TS_UNIX ) - wfTimestamp( TS_UNIX, $reg ) ); |
| 294 | 294 | $attribs = array( |
| 295 | 295 | 'id' => $globalUser->getId(), |
| 296 | | - 'registered' => $wgLang->timeanddate( $reg, true ) . " ($age)", |
| | 296 | + 'registered' => htmlspecialchars( $wgLang->timeanddate( $reg, true ) . " ($age)" ), |
| 297 | 297 | 'home' => $this->determineHomeWiki(), |
| 298 | | - 'editcount' => $wgLang->formatNum( $this->evaluateTotalEditcount() ), |
| 299 | | - 'locked' => $globalUser->isLocked() ? wfMsg( 'centralauth-admin-yes' ) : wfMsg( 'centralauth-admin-no' ), |
| 300 | | - 'hidden' => $this->formatHiddenLevel( $globalUser->getHiddenLevel() ) ); |
| | 298 | + 'editcount' => htmlspecialchars( $wgLang->formatNum( $this->evaluateTotalEditcount() ) ), |
| | 299 | + 'locked' => wfMsgHtml( $globalUser->isLocked() ? 'centralauth-admin-yes' : 'centralauth-admin-no' ), |
| | 300 | + 'hidden' => $this->formatHiddenLevel( $globalUser->getHiddenLevel() ) |
| | 301 | + ); |
| 301 | 302 | $out = '<fieldset id="mw-centralauth-info">'; |
| 302 | | - $out .= '<legend>' . wfMsgHtml( 'centralauth-admin-info-header' ) . '</legend>'; |
| | 303 | + $out .= '<legend>' . wfMsgHtml( 'centralauth-admin-info-header' ) . '</legend><ul>'; |
| 303 | 304 | foreach ( $attribs as $tag => $data ) { |
| 304 | | - $out .= '<p><strong>' . wfMsgHtml( "centralauth-admin-info-$tag" ) . '</strong> ' . |
| 305 | | - htmlspecialchars( $data ) . '</p>'; |
| | 305 | + $out .= '<li><strong>' . wfMsgHtml( "centralauth-admin-info-$tag" ) . '</strong> ' . |
| | 306 | + $data . '</li>'; |
| 306 | 307 | } |
| 307 | | - $out .= '</fieldset>'; |
| | 308 | + $out .= '</ul></fieldset>'; |
| 308 | 309 | $wgOut->addHTML( $out ); |
| 309 | 310 | } |
| 310 | 311 | |
| — | — | @@ -493,11 +494,11 @@ |
| 494 | 495 | function formatHiddenLevel( $level ) { |
| 495 | 496 | switch( $level ) { |
| 496 | 497 | case CentralAuthUser::HIDDEN_NONE: |
| 497 | | - return wfMsg( 'centralauth-admin-no' ); |
| | 498 | + return wfMsgHtml( 'centralauth-admin-no' ); |
| 498 | 499 | case CentralAuthUser::HIDDEN_LISTS: |
| 499 | | - return wfMsg( 'centralauth-admin-hidden-list' ); |
| | 500 | + return wfMsgHtml( 'centralauth-admin-hidden-list' ); |
| 500 | 501 | case CentralAuthUser::HIDDEN_OVERSIGHT: |
| 501 | | - return wfMsg( 'centralauth-admin-hidden-oversight' ); |
| | 502 | + return wfMsgHtml( 'centralauth-admin-hidden-oversight' ); |
| 502 | 503 | } |
| 503 | 504 | return ''; |
| 504 | 505 | } |
| — | — | @@ -697,7 +698,7 @@ |
| 698 | 699 | function determineHomeWiki() { |
| 699 | 700 | foreach ( $this->mAttachedLocalAccounts as $wiki => $acc ) { |
| 700 | 701 | if ( $acc['attachedMethod'] == 'primary' || $acc['attachedMethod'] == 'new' ) { |
| 701 | | - return $wiki; |
| | 702 | + return self::foreignUserLink( $wiki ); |
| 702 | 703 | } |
| 703 | 704 | } |
| 704 | 705 | |