| Index: trunk/extensions/AbuseFilter/special/SpecialAbuseLog.php |
| — | — | @@ -350,7 +350,7 @@ |
| 351 | 351 | function formatRow( $row, $li = true ) { |
| 352 | 352 | $user = $this->getUser(); |
| 353 | 353 | $sk = $this->getSkin(); |
| 354 | | - $lang = $this->getLang(); |
| | 354 | + $lang = $this->getLanguage(); |
| 355 | 355 | |
| 356 | 356 | $actionLinks = array(); |
| 357 | 357 | |
| Index: trunk/extensions/AbuseFilter/Views/AbuseFilterViewDiff.php |
| — | — | @@ -22,7 +22,7 @@ |
| 23 | 23 | $links[$msg] = Linker::link( $title, wfMsgExt( $msg, 'parseinline' ) ); |
| 24 | 24 | } |
| 25 | 25 | |
| 26 | | - $backlinks = $this->getLang()->pipeList( $links ); |
| | 26 | + $backlinks = $this->getLanguage()->pipeList( $links ); |
| 27 | 27 | $out->addHTML( Xml::tags( 'p', null, $backlinks ) ); |
| 28 | 28 | |
| 29 | 29 | if ( $show ) { |
| — | — | @@ -150,7 +150,7 @@ |
| 151 | 151 | |
| 152 | 152 | function formatVersionLink( $timestamp, $history_id ) { |
| 153 | 153 | $filter = $this->mFilter; |
| 154 | | - $text = $this->getLang()->timeanddate( $timestamp, true ); |
| | 154 | + $text = $this->getLanguage()->timeanddate( $timestamp, true ); |
| 155 | 155 | $title = $this->getTitle( "history/$filter/item/$history_id" ); |
| 156 | 156 | |
| 157 | 157 | $link = Linker::link( $title, $text ); |
| Index: trunk/extensions/AbuseFilter/Views/AbuseFilterViewList.php |
| — | — | @@ -113,7 +113,7 @@ |
| 114 | 114 | $overflow_percent = sprintf( "%.2f", 100 * $overflow_count / $total_count ); |
| 115 | 115 | $match_percent = sprintf( "%.2f", 100 * $match_count / $total_count ); |
| 116 | 116 | |
| 117 | | - $lang = $this->getLang(); |
| | 117 | + $lang = $this->getLanguage(); |
| 118 | 118 | $status = wfMsgExt( 'abusefilter-status', array( 'parseinline' ), |
| 119 | 119 | $lang->formatNum( $total_count ), |
| 120 | 120 | $lang->formatNum( $overflow_count ), |
| — | — | @@ -180,7 +180,7 @@ |
| 181 | 181 | } |
| 182 | 182 | |
| 183 | 183 | function formatValue( $name, $value ) { |
| 184 | | - $lang = $this->getLang(); |
| | 184 | + $lang = $this->getLanguage(); |
| 185 | 185 | $row = $this->mCurrentRow; |
| 186 | 186 | |
| 187 | 187 | switch( $name ) { |
| Index: trunk/extensions/AbuseFilter/Views/AbuseFilterViewHistory.php |
| — | — | @@ -38,7 +38,7 @@ |
| 39 | 39 | $links[$msg] = $sk->link( $title, wfMsgExt( $msg, 'parseinline' ) ); |
| 40 | 40 | } |
| 41 | 41 | |
| 42 | | - $backlinks = $this->getLang()->pipeList( $links ); |
| | 42 | + $backlinks = $this->getLanguage()->pipeList( $links ); |
| 43 | 43 | $out->addHTML( Xml::tags( 'p', null, $backlinks ) ); |
| 44 | 44 | |
| 45 | 45 | # For user |
| — | — | @@ -119,7 +119,7 @@ |
| 120 | 120 | |
| 121 | 121 | function formatValue( $name, $value ) { |
| 122 | 122 | $sk = $this->getSkin(); |
| 123 | | - $lang = $this->getLang(); |
| | 123 | + $lang = $this->getLanguage(); |
| 124 | 124 | |
| 125 | 125 | $row = $this->mCurrentRow; |
| 126 | 126 | |
| Index: trunk/extensions/AbuseFilter/Views/AbuseFilterViewEdit.php |
| — | — | @@ -240,7 +240,7 @@ |
| 241 | 241 | |
| 242 | 242 | // Build the edit form |
| 243 | 243 | $out = $this->getOutput(); |
| 244 | | - $lang = $this->getLang(); |
| | 244 | + $lang = $this->getLanguage(); |
| 245 | 245 | $user = $this->getUser(); |
| 246 | 246 | $sk = $this->getSkin(); |
| 247 | 247 | |
| — | — | @@ -655,7 +655,7 @@ |
| 656 | 656 | |
| 657 | 657 | $existingSelector->addOption( 'abusefilter-warning' ); |
| 658 | 658 | |
| 659 | | - $lang = $this->getLang(); |
| | 659 | + $lang = $this->getLanguage(); |
| 660 | 660 | foreach( $res as $row ) { |
| 661 | 661 | if ( $lang->lcfirst( $row->page_title ) == $lang->lcfirst( $warnMsg ) ) { |
| 662 | 662 | $existingSelector->setDefault( $lang->lcfirst( $warnMsg ) ); |
| Index: trunk/extensions/AbuseFilter/Views/AbuseFilterViewExamine.php |
| — | — | @@ -123,7 +123,7 @@ |
| 124 | 124 | $vars = $vars->exportAllVars(); |
| 125 | 125 | } |
| 126 | 126 | |
| 127 | | - $output = ''; |
| | 127 | + $html = ''; |
| 128 | 128 | |
| 129 | 129 | $output->addModules( 'ext.abuseFilter.examine' ); |
| 130 | 130 | |
| — | — | @@ -149,8 +149,8 @@ |
| 150 | 150 | 'id' => 'mw-abusefilter-load' |
| 151 | 151 | ) |
| 152 | 152 | ); |
| 153 | | - $output .= Xml::tags( 'div', array( 'id' => 'mw-abusefilter-examine-editor' ), $tester ); |
| 154 | | - $output .= Xml::tags( 'p', |
| | 153 | + $html .= Xml::tags( 'div', array( 'id' => 'mw-abusefilter-examine-editor' ), $tester ); |
| | 154 | + $html .= Xml::tags( 'p', |
| 155 | 155 | null, |
| 156 | 156 | Xml::element( 'input', |
| 157 | 157 | array( |
| — | — | @@ -169,10 +169,10 @@ |
| 170 | 170 | } |
| 171 | 171 | |
| 172 | 172 | // Variable dump |
| 173 | | - $output .= Xml::tags( 'h2', null, wfMsgExt( 'abusefilter-examine-vars', 'parseinline' ) ); |
| 174 | | - $output .= AbuseFilter::buildVarDumpTable( $vars ); |
| | 173 | + $html .= Xml::tags( 'h2', null, wfMsgExt( 'abusefilter-examine-vars', 'parseinline' ) ); |
| | 174 | + $html .= AbuseFilter::buildVarDumpTable( $vars ); |
| 175 | 175 | |
| 176 | | - $output->addHTML( $output ); |
| | 176 | + $output->addHTML( $html ); |
| 177 | 177 | } |
| 178 | 178 | |
| 179 | 179 | function loadParameters() { |
| Index: trunk/extensions/AbuseFilter/Views/AbuseFilterViewRevert.php |
| — | — | @@ -56,7 +56,7 @@ |
| 57 | 57 | |
| 58 | 58 | // Look up all of them. |
| 59 | 59 | $results = $this->doLookup(); |
| 60 | | - $lang = $this->getLang(); |
| | 60 | + $lang = $this->getLanguage(); |
| 61 | 61 | $list = array(); |
| 62 | 62 | |
| 63 | 63 | foreach ( $results as $result ) { |
| Index: trunk/extensions/AbuseFilter/AbuseFilter.class.php |
| — | — | @@ -163,7 +163,7 @@ |
| 164 | 164 | } |
| 165 | 165 | } |
| 166 | 166 | |
| 167 | | - $linkStr = wfMsg( 'parentheses', $context->getLang()->pipeList( $links ) ); |
| | 167 | + $linkStr = wfMsg( 'parentheses', $context->getLanguage()->pipeList( $links ) ); |
| 168 | 168 | $linkStr = wfMsgExt( 'abusefilter-topnav', 'parseinline' ) . " $linkStr"; |
| 169 | 169 | |
| 170 | 170 | $linkStr = Xml::tags( 'div', array( 'class' => 'mw-abusefilter-navigation' ), $linkStr ); |