| Index: trunk/phase3/includes/specials/SpecialDoubleRedirects.php |
| — | — | @@ -76,8 +76,6 @@ |
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | function formatResult( $skin, $result ) { |
| 80 | | - global $wgLang; |
| 81 | | - |
| 82 | 80 | $titleA = Title::makeTitle( $result->namespace, $result->title ); |
| 83 | 81 | |
| 84 | 82 | if ( $result && !isset( $result->nsb ) ) { |
| — | — | @@ -91,19 +89,20 @@ |
| 92 | 90 | } |
| 93 | 91 | } |
| 94 | 92 | if ( !$result ) { |
| 95 | | - return '<del>' . $skin->link( $titleA, null, array(), array( 'redirect' => 'no' ) ) . '</del>'; |
| | 93 | + return '<del>' . Linker::link( $titleA, null, array(), array( 'redirect' => 'no' ) ) . '</del>'; |
| 96 | 94 | } |
| 97 | 95 | |
| 98 | 96 | $titleB = Title::makeTitle( $result->nsb, $result->tb ); |
| 99 | 97 | $titleC = Title::makeTitle( $result->nsc, $result->tc ); |
| 100 | 98 | |
| 101 | | - $linkA = $skin->linkKnown( |
| | 99 | + $linkA = Linker::linkKnown( |
| 102 | 100 | $titleA, |
| 103 | 101 | null, |
| 104 | 102 | array(), |
| 105 | 103 | array( 'redirect' => 'no' ) |
| 106 | 104 | ); |
| 107 | | - $edit = $skin->linkKnown( |
| | 105 | + |
| | 106 | + $edit = Linker::linkKnown( |
| 108 | 107 | $titleA, |
| 109 | 108 | wfMsgExt( 'parentheses', array( 'escape' ), wfMsg( 'editlink' ) ), |
| 110 | 109 | array(), |
| — | — | @@ -112,15 +111,19 @@ |
| 113 | 112 | 'action' => 'edit' |
| 114 | 113 | ) |
| 115 | 114 | ); |
| 116 | | - $linkB = $skin->linkKnown( |
| | 115 | + |
| | 116 | + $linkB = Linker::linkKnown( |
| 117 | 117 | $titleB, |
| 118 | 118 | null, |
| 119 | 119 | array(), |
| 120 | 120 | array( 'redirect' => 'no' ) |
| 121 | 121 | ); |
| 122 | | - $linkC = $skin->linkKnown( $titleC ); |
| 123 | | - $arr = $wgLang->getArrow() . $wgLang->getDirMark(); |
| 124 | 122 | |
| | 123 | + $linkC = Linker::linkKnown( $titleC ); |
| | 124 | + |
| | 125 | + $lang = $this->getLang(); |
| | 126 | + $arr = $lang->getArrow() . $lang->getDirMark(); |
| | 127 | + |
| 125 | 128 | return( "{$linkA} {$edit} {$arr} {$linkB} {$arr} {$linkC}" ); |
| 126 | 129 | } |
| 127 | 130 | } |