diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2012-05-03 13:01:35 +0200 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2012-05-03 13:01:35 +0200 |
commit | d9022f63880ce039446fba8364f68e656b7bf4cb (patch) | |
tree | 16b40fbf17bf7c9ee6f4ead25b16dd192378050a /includes/specials/SpecialAllmessages.php | |
parent | 27cf83d177256813e2e802241085fce5dd0f3fb9 (diff) |
Update to MediaWiki 1.19.0
Diffstat (limited to 'includes/specials/SpecialAllmessages.php')
-rw-r--r-- | includes/specials/SpecialAllmessages.php | 78 |
1 files changed, 40 insertions, 38 deletions
diff --git a/includes/specials/SpecialAllmessages.php b/includes/specials/SpecialAllmessages.php index 24815825..2bfea4c3 100644 --- a/includes/specials/SpecialAllmessages.php +++ b/includes/specials/SpecialAllmessages.php @@ -100,22 +100,22 @@ class AllmessagesTablePager extends TablePager { public $custom; function __construct( $page, $conds, $langObj = null ) { - parent::__construct(); + parent::__construct( $page->getContext() ); $this->mIndexField = 'am_title'; $this->mPage = $page; $this->mConds = $conds; $this->mDefaultDirection = true; // always sort ascending $this->mLimitsShown = array( 20, 50, 100, 250, 500, 5000 ); - global $wgLang, $wgContLang, $wgRequest; + global $wgContLang; - $this->talk = htmlspecialchars( wfMsg( 'talkpagelinktext' ) ); + $this->talk = $this->msg( 'talkpagelinktext' )->escaped(); $this->lang = ( $langObj ? $langObj : $wgContLang ); $this->langcode = $this->lang->getCode(); $this->foreign = $this->langcode != $wgContLang->getCode(); - $request = $wgRequest; + $request = $this->getRequest(); $this->filter = $request->getVal( 'filter', 'all' ); if( $this->filter === 'all' ){ @@ -124,8 +124,8 @@ class AllmessagesTablePager extends TablePager { $this->custom = ($this->filter == 'unmodified'); } - $prefix = $wgLang->ucfirst( $wgRequest->getVal( 'prefix', '' ) ); - $prefix = $prefix != '' ? Title::makeTitleSafe( NS_MEDIAWIKI, $wgRequest->getVal( 'prefix', null ) ) : null; + $prefix = $this->getLanguage()->ucfirst( $request->getVal( 'prefix', '' ) ); + $prefix = $prefix != '' ? Title::makeTitleSafe( NS_MEDIAWIKI, $request->getVal( 'prefix', null ) ) : null; if( $prefix !== null ){ $this->displayPrefix = $prefix->getDBkey(); $this->prefix = '/^' . preg_quote( $this->displayPrefix ) . '/i'; @@ -150,12 +150,12 @@ class AllmessagesTablePager extends TablePager { ksort( $languages ); $out = Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript, 'id' => 'mw-allmessages-form' ) ) . - Xml::fieldset( wfMsg( 'allmessages-filter-legend' ) ) . + Xml::fieldset( $this->msg( 'allmessages-filter-legend' )->text() ) . Html::hidden( 'title', $this->getTitle()->getPrefixedText() ) . Xml::openElement( 'table', array( 'class' => 'mw-allmessages-table' ) ) . "\n" . '<tr> <td class="mw-label">' . - Xml::label( wfMsg( 'allmessages-prefix' ), 'mw-allmessages-form-prefix' ) . + Xml::label( $this->msg( 'allmessages-prefix' )->text(), 'mw-allmessages-form-prefix' ) . "</td>\n <td class=\"mw-input\">" . Xml::input( 'prefix', 20, str_replace( '_', ' ', $this->displayPrefix ), array( 'id' => 'mw-allmessages-form-prefix' ) ) . @@ -163,22 +163,22 @@ class AllmessagesTablePager extends TablePager { </tr> <tr>\n <td class='mw-label'>" . - wfMsg( 'allmessages-filter' ) . + $this->msg( 'allmessages-filter' )->escaped() . "</td>\n <td class='mw-input'>" . - Xml::radioLabel( wfMsg( 'allmessages-filter-unmodified' ), + Xml::radioLabel( $this->msg( 'allmessages-filter-unmodified' )->text(), 'filter', 'unmodified', 'mw-allmessages-form-filter-unmodified', ( $this->filter == 'unmodified' ) ) . - Xml::radioLabel( wfMsg( 'allmessages-filter-all' ), + Xml::radioLabel( $this->msg( 'allmessages-filter-all' )->text(), 'filter', 'all', 'mw-allmessages-form-filter-all', ( $this->filter == 'all' ) ) . - Xml::radioLabel( wfMsg( 'allmessages-filter-modified' ), + Xml::radioLabel( $this->msg( 'allmessages-filter-modified' )->text(), 'filter', 'modified', 'mw-allmessages-form-filter-modified', @@ -188,7 +188,7 @@ class AllmessagesTablePager extends TablePager { </tr> <tr>\n <td class=\"mw-label\">" . - Xml::label( wfMsg( 'allmessages-language' ), 'mw-allmessages-form-lang' ) . + Xml::label( $this->msg( 'allmessages-language' )->text(), 'mw-allmessages-form-lang' ) . "</td>\n <td class=\"mw-input\">" . Xml::openElement( 'select', array( 'id' => 'mw-allmessages-form-lang', 'name' => 'lang' ) ); @@ -203,7 +203,7 @@ class AllmessagesTablePager extends TablePager { '<tr> <td class="mw-label">' . - Xml::label( wfMsg( 'table_pager_limit_label'), 'mw-table_pager_limit_label' ) . + Xml::label( $this->msg( 'table_pager_limit_label' )->text(), 'mw-table_pager_limit_label' ) . '</td> <td class="mw-input">' . $this->getLimitSelect() . @@ -211,7 +211,7 @@ class AllmessagesTablePager extends TablePager { <tr> <td></td> <td>' . - Xml::submitButton( wfMsg( 'allmessages-filter-submit' ) ) . + Xml::submitButton( $this->msg( 'allmessages-filter-submit' )->text() ) . "</td>\n </tr>" . @@ -247,8 +247,10 @@ class AllmessagesTablePager extends TablePager { * @param array $messageNames * @param string $langcode What language code * @param bool $foreign Whether the $langcode is not the content language + * @return array: a 'pages' and 'talks' array with the keys of existing pages */ public static function getCustomisedStatuses( $messageNames, $langcode = 'en', $foreign = false ) { + // FIXME: This function should be moved to Language:: or something. wfProfileIn( __METHOD__ . '-db' ); $dbr = wfGetDB( DB_SLAVE ); @@ -263,18 +265,20 @@ class AllmessagesTablePager extends TablePager { $pageFlags = $talkFlags = array(); foreach ( $res as $s ) { - if( $s->page_namespace == NS_MEDIAWIKI ) { - if( $foreign ) { - $title = explode( '/', $s->page_title ); - if( count( $title ) === 2 && $langcode == $title[1] - && isset( $xNames[$title[0]] ) ) { - $pageFlags["{$title[0]}"] = true; - } - } elseif( isset( $xNames[$s->page_title] ) ) { - $pageFlags[$s->page_title] = true; + $exists = false; + if( $foreign ) { + $title = explode( '/', $s->page_title ); + if( count( $title ) === 2 && $langcode == $title[1] + && isset( $xNames[$title[0]] ) ) { + $exists = $title[0]; } - } elseif( $s->page_namespace == NS_MEDIAWIKI_TALK ){ - $talkFlags[$s->page_title] = true; + } elseif( isset( $xNames[$s->page_title] ) ) { + $exists = $s->page_title; + } + if( $exists && $s->page_namespace == NS_MEDIAWIKI ) { + $pageFlags[$exists] = true; + } elseif( $exists && $s->page_namespace == NS_MEDIAWIKI_TALK ) { + $talkFlags[$exists] = true; } } @@ -319,24 +323,23 @@ class AllmessagesTablePager extends TablePager { } function getStartBody() { - return Xml::openElement( 'table', array( 'class' => 'TablePager', 'id' => 'mw-allmessagestable' ) ) . "\n" . + return Xml::openElement( 'table', array( 'class' => 'mw-datatable TablePager', 'id' => 'mw-allmessagestable' ) ) . "\n" . "<thead><tr> <th rowspan=\"2\">" . - wfMsg( 'allmessagesname' ) . " + $this->msg( 'allmessagesname' )->escaped() . " </th> <th>" . - wfMsg( 'allmessagesdefault' ) . + $this->msg( 'allmessagesdefault' )->escaped() . "</th> </tr>\n <tr> <th>" . - wfMsg( 'allmessagescurrent' ) . + $this->msg( 'allmessagescurrent' )->escaped() . "</th> </tr></thead><tbody>\n"; } function formatValue( $field, $value ){ - global $wgLang; switch( $field ){ case 'am_title' : @@ -345,11 +348,11 @@ class AllmessagesTablePager extends TablePager { $talk = Title::makeTitle( NS_MEDIAWIKI_TALK, $value . $this->suffix ); if( $this->mCurrentRow->am_customised ){ - $title = Linker::linkKnown( $title, $wgLang->lcfirst( $value ) ); + $title = Linker::linkKnown( $title, $this->getLanguage()->lcfirst( $value ) ); } else { $title = Linker::link( $title, - $wgLang->lcfirst( $value ), + $this->getLanguage()->lcfirst( $value ), array(), array(), array( 'broken' ) @@ -394,12 +397,11 @@ class AllmessagesTablePager extends TablePager { function getRowAttrs( $row, $isSecond = false ){ $arr = array(); - global $wgLang; if( $row->am_customised ){ $arr['class'] = 'allmessages-customised'; } if( !$isSecond ){ - $arr['id'] = Sanitizer::escapeId( 'msg_' . $wgLang->lcfirst( $row->am_title ) ); + $arr['id'] = Sanitizer::escapeId( 'msg_' . $this->getLanguage()->lcfirst( $row->am_title ) ); } return $arr; } @@ -407,7 +409,7 @@ class AllmessagesTablePager extends TablePager { function getCellAttrs( $field, $value ){ if( $this->mCurrentRow->am_customised && $field == 'am_title' ){ return array( 'rowspan' => '2', 'class' => $field ); - } else if( $field == 'am_title' ) { + } elseif( $field == 'am_title' ) { return array( 'class' => $field ); } else { return array( 'lang' => $this->langcode, 'dir' => $this->lang->getDir(), 'class' => $field ); @@ -417,8 +419,8 @@ class AllmessagesTablePager extends TablePager { // This is not actually used, as getStartBody is overridden above function getFieldNames() { return array( - 'am_title' => wfMsg( 'allmessagesname' ), - 'am_default' => wfMsg( 'allmessagesdefault' ) + 'am_title' => $this->msg( 'allmessagesname' )->text(), + 'am_default' => $this->msg( 'allmessagesdefault' )->text() ); } |