| Index: trunk/phase3/includes/GlobalFunctions.php |
| — | — | @@ -2522,8 +2522,7 @@ |
| 2523 | 2523 | } |
| 2524 | 2524 | |
| 2525 | 2525 | function wfSpecialList( $page, $details ) { |
| 2526 | | - global $wgContLang; |
| 2527 | | - $details = $details ? ' ' . $wgContLang->getDirMark() . "($details)" : ''; |
| | 2526 | + $details = $details ? ' ' . wfUILang()->getDirMark() . "($details)" : ''; |
| 2528 | 2527 | return $page . $details; |
| 2529 | 2528 | } |
| 2530 | 2529 | |
| Index: trunk/phase3/includes/specials/SpecialProtectedpages.php |
| — | — | @@ -76,7 +76,7 @@ |
| 77 | 77 | * @return string Formatted <li> element |
| 78 | 78 | */ |
| 79 | 79 | public function formatRow( $row ) { |
| 80 | | - global $wgUser, $wgLang, $wgContLang; |
| | 80 | + global $wgUser, $wgLang; |
| 81 | 81 | |
| 82 | 82 | wfProfileIn( __METHOD__ ); |
| 83 | 83 | |
| — | — | @@ -116,7 +116,7 @@ |
| 117 | 117 | } |
| 118 | 118 | |
| 119 | 119 | if(!is_null($size = $row->page_len)) { |
| 120 | | - $stxt = $wgContLang->getDirMark() . ' ' . $skin->formatRevisionSize( $size ); |
| | 120 | + $stxt = wfUILang()->getDirMark() . ' ' . $skin->formatRevisionSize( $size ); |
| 121 | 121 | } |
| 122 | 122 | |
| 123 | 123 | # Show a link to the change protection form for allowed users otherwise a link to the protection log |
| Index: trunk/phase3/includes/specials/SpecialDoubleRedirects.php |
| — | — | @@ -76,8 +76,6 @@ |
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | function formatResult( $skin, $result ) { |
| 80 | | - global $wgContLang; |
| 81 | | - |
| 82 | 80 | $titleA = Title::makeTitle( $result->namespace, $result->title ); |
| 83 | 81 | |
| 84 | 82 | if ( $result && !isset( $result->nsb ) ) { |
| — | — | @@ -119,7 +117,7 @@ |
| 120 | 118 | array( 'redirect' => 'no' ) |
| 121 | 119 | ); |
| 122 | 120 | $linkC = $skin->linkKnown( $titleC ); |
| 123 | | - $arr = $wgContLang->getArrow() . $wgContLang->getDirMark(); |
| | 121 | + $arr = wfUILang()->getArrow() . wfUILang()->getDirMark(); |
| 124 | 122 | |
| 125 | 123 | return( "{$linkA} {$edit} {$arr} {$linkB} {$arr} {$linkC}" ); |
| 126 | 124 | } |
| Index: trunk/phase3/includes/specials/SpecialListredirects.php |
| — | — | @@ -96,8 +96,6 @@ |
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | function formatResult( $skin, $result ) { |
| 100 | | - global $wgContLang; |
| 101 | | - |
| 102 | 100 | # Make a link to the redirect itself |
| 103 | 101 | $rd_title = Title::makeTitle( $result->namespace, $result->title ); |
| 104 | 102 | $rd_link = $skin->link( |
| — | — | @@ -111,7 +109,7 @@ |
| 112 | 110 | $target = $this->getRedirectTarget( $result ); |
| 113 | 111 | if( $target ) { |
| 114 | 112 | # Make a link to the destination page |
| 115 | | - $arr = $wgContLang->getArrow() . $wgContLang->getDirMark(); |
| | 113 | + $arr = wfUILang()->getArrow() . wfUILang()->getDirMark(); |
| 116 | 114 | $targetLink = $skin->link( $target ); |
| 117 | 115 | return "$rd_link $arr $targetLink"; |
| 118 | 116 | } else { |
| Index: trunk/phase3/includes/specials/SpecialNewpages.php |
| — | — | @@ -289,7 +289,7 @@ |
| 290 | 290 | * @return String |
| 291 | 291 | */ |
| 292 | 292 | public function formatRow( $result ) { |
| 293 | | - global $wgLang, $wgContLang; |
| | 293 | + global $wgLang; |
| 294 | 294 | |
| 295 | 295 | # Revision deletion works on revisions, so we should cast one |
| 296 | 296 | $row = array( |
| — | — | @@ -302,7 +302,7 @@ |
| 303 | 303 | |
| 304 | 304 | $classes = array(); |
| 305 | 305 | |
| 306 | | - $dm = $wgContLang->getDirMark(); |
| | 306 | + $dm = wfUILang()->getDirMark(); |
| 307 | 307 | |
| 308 | 308 | $title = Title::makeTitleSafe( $result->rc_namespace, $result->rc_title ); |
| 309 | 309 | $time = Html::element( 'span', array( 'class' => 'mw-newpages-time' ), |
| Index: trunk/phase3/includes/specials/SpecialDisambiguations.php |
| — | — | @@ -122,14 +122,13 @@ |
| 123 | 123 | } |
| 124 | 124 | |
| 125 | 125 | function formatResult( $skin, $result ) { |
| 126 | | - global $wgContLang; |
| 127 | 126 | $title = Title::newFromID( $result->value ); |
| 128 | 127 | $dp = Title::makeTitle( $result->namespace, $result->title ); |
| 129 | 128 | |
| 130 | 129 | $from = $skin->link( $title ); |
| 131 | 130 | $edit = $skin->link( $title, wfMsgExt( 'parentheses', array( 'escape' ), wfMsg( 'editlink' ) ) , |
| 132 | 131 | array(), array( 'redirect' => 'no', 'action' => 'edit' ) ); |
| 133 | | - $arr = $wgContLang->getArrow(); |
| | 132 | + $arr = wfUILang()->getArrow(); |
| 134 | 133 | $to = $skin->link( $dp ); |
| 135 | 134 | |
| 136 | 135 | return "$from $edit $arr $to"; |
| Index: trunk/phase3/includes/specials/SpecialBrokenRedirects.php |
| — | — | @@ -77,7 +77,7 @@ |
| 78 | 78 | * @return String |
| 79 | 79 | */ |
| 80 | 80 | function formatResult( $skin, $result ) { |
| 81 | | - global $wgUser, $wgContLang, $wgLang; |
| | 81 | + global $wgUser, $wgLang; |
| 82 | 82 | |
| 83 | 83 | $fromObj = Title::makeTitle( $result->namespace, $result->title ); |
| 84 | 84 | if ( isset( $result->rd_title ) ) { |
| — | — | @@ -116,7 +116,7 @@ |
| 117 | 117 | array(), |
| 118 | 118 | array( 'broken' ) |
| 119 | 119 | ); |
| 120 | | - $arr = $wgContLang->getArrow(); |
| | 120 | + $arr = wfUILang()->getArrow(); |
| 121 | 121 | |
| 122 | 122 | $out = $from . wfMsg( 'word-separator' ); |
| 123 | 123 | |
| Index: trunk/phase3/includes/specials/SpecialFileDuplicateSearch.php |
| — | — | @@ -91,7 +91,7 @@ |
| 92 | 92 | } |
| 93 | 93 | |
| 94 | 94 | function execute( $par ) { |
| 95 | | - global $wgRequest, $wgOut, $wgLang, $wgContLang, $wgScript; |
| | 95 | + global $wgRequest, $wgOut, $wgLang, $wgScript; |
| 96 | 96 | |
| 97 | 97 | $this->setHeaders(); |
| 98 | 98 | $this->outputHeader(); |
| — | — | @@ -126,7 +126,7 @@ |
| 127 | 127 | } |
| 128 | 128 | |
| 129 | 129 | if( $this->hash != '' ) { |
| 130 | | - $align = $wgContLang->alignEnd(); |
| | 130 | + $align = wfUILang()->alignEnd(); |
| 131 | 131 | |
| 132 | 132 | # Show a thumbnail of the file |
| 133 | 133 | $img = $this->file; |
| Index: trunk/phase3/includes/specials/SpecialContributions.php |
| — | — | @@ -543,7 +543,7 @@ |
| 544 | 544 | * @todo This would probably look a lot nicer in a table. |
| 545 | 545 | */ |
| 546 | 546 | function formatRow( $row ) { |
| 547 | | - global $wgUser, $wgLang, $wgContLang; |
| | 547 | + global $wgUser, $wgLang; |
| 548 | 548 | wfProfileIn( __METHOD__ ); |
| 549 | 549 | |
| 550 | 550 | $sk = $this->getSkin(); |
| — | — | @@ -590,7 +590,7 @@ |
| 591 | 591 | array( 'action' => 'history' ) |
| 592 | 592 | ); |
| 593 | 593 | |
| 594 | | - $comment = $wgContLang->getDirMark() . $sk->revComment( $rev, false, true ); |
| | 594 | + $comment = wfUILang()->getDirMark() . $sk->revComment( $rev, false, true ); |
| 595 | 595 | $date = $wgLang->timeanddate( wfTimestamp( TS_MW, $row->rev_timestamp ), true ); |
| 596 | 596 | if( $rev->userCan( Revision::DELETED_TEXT ) ) { |
| 597 | 597 | $d = $sk->linkKnown( |
| Index: trunk/phase3/includes/specials/SpecialShortpages.php |
| — | — | @@ -86,8 +86,8 @@ |
| 87 | 87 | } |
| 88 | 88 | |
| 89 | 89 | function formatResult( $skin, $result ) { |
| 90 | | - global $wgLang, $wgContLang; |
| 91 | | - $dm = $wgContLang->getDirMark(); |
| | 90 | + global $wgLang; |
| | 91 | + $dm = wfUILang()->getDirMark(); |
| 92 | 92 | |
| 93 | 93 | $title = Title::makeTitle( $result->namespace, $result->title ); |
| 94 | 94 | if ( !$title ) { |
| Index: trunk/phase3/includes/specials/SpecialVersion.php |
| — | — | @@ -49,7 +49,7 @@ |
| 50 | 50 | * main() |
| 51 | 51 | */ |
| 52 | 52 | public function execute( $par ) { |
| 53 | | - global $wgOut, $wgSpecialVersionShowHooks, $wgContLang, $wgRequest; |
| | 53 | + global $wgOut, $wgSpecialVersionShowHooks, $wgRequest; |
| 54 | 54 | |
| 55 | 55 | $this->setHeaders(); |
| 56 | 56 | $this->outputHeader(); |
| Index: trunk/phase3/includes/LogEventsList.php |
| — | — | @@ -364,12 +364,11 @@ |
| 365 | 365 | } |
| 366 | 366 | |
| 367 | 367 | private function logComment( $row ) { |
| 368 | | - global $wgContLang; |
| 369 | 368 | if( self::isDeleted( $row, LogPage::DELETED_COMMENT ) ) { |
| 370 | 369 | $comment = '<span class="history-deleted">' . |
| 371 | 370 | wfMsgHtml( 'rev-deleted-comment' ) . '</span>'; |
| 372 | 371 | } else { |
| 373 | | - $comment = $wgContLang->getDirMark() . |
| | 372 | + $comment = wfUILang()->getDirMark() . |
| 374 | 373 | $this->skin->commentBlock( $row->log_comment ); |
| 375 | 374 | } |
| 376 | 375 | return $comment; |