From: umherirrender Date: Sun, 14 Apr 2013 19:57:46 +0000 (+0200) Subject: Added spaces before and removed spaces after 'array' X-Git-Tag: 1.31.0-rc.0~20006^2 X-Git-Url: http://git.heureux-cyclage.org/?a=commitdiff_plain;h=97234cc88478c1689e06d9c710808d6286a804b1;p=lhc%2Fweb%2Fwiklou.git Added spaces before and removed spaces after 'array' Fix some other spacing while at it Change-Id: I13f81533eaf40e06c13cf377c0f08ef5cef01d00 --- diff --git a/includes/EditPage.php b/includes/EditPage.php index 86a7a77b3c..6718442b2f 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -1942,7 +1942,7 @@ class EditPage { # there must be a description url to show a hint to shared repo if( $descUrl ) { if( !$this->mTitle->exists() ) { - $wgOut->wrapWikiMsg( "
\n$1\n
", array ( + $wgOut->wrapWikiMsg( "
\n$1\n
", array( 'sharedupload-desc-create', $file->getRepo()->getDisplayName(), $descUrl ) ); } else { @@ -2632,7 +2632,7 @@ HTML $attribs = $customAttribs + array( 'accesskey' => ',', - 'id' => $name, + 'id' => $name, 'cols' => $wgUser->getIntOption( 'cols' ), 'rows' => $wgUser->getIntOption( 'rows' ), 'style' => '' // avoid php notices when appending preferences (appending allows customAttribs['style'] to still work @@ -3320,9 +3320,9 @@ HTML $minorLabel = wfMessage( 'minoredit' )->parse(); if ( $wgUser->isAllowed( 'minoredit' ) ) { $attribs = array( - 'tabindex' => ++$tabindex, + 'tabindex' => ++$tabindex, 'accesskey' => wfMessage( 'accesskey-minoredit' )->text(), - 'id' => 'wpMinoredit', + 'id' => 'wpMinoredit', ); $checkboxes['minor'] = Xml::check( 'wpMinoredit', $checked['minor'], $attribs ) . @@ -3336,9 +3336,9 @@ HTML $checkboxes['watch'] = ''; if ( $wgUser->isLoggedIn() ) { $attribs = array( - 'tabindex' => ++$tabindex, + 'tabindex' => ++$tabindex, 'accesskey' => wfMessage( 'accesskey-watch' )->text(), - 'id' => 'wpWatchthis', + 'id' => 'wpWatchthis', ); $checkboxes['watch'] = Xml::check( 'wpWatchthis', $checked['watch'], $attribs ) . @@ -3362,37 +3362,37 @@ HTML $buttons = array(); $temp = array( - 'id' => 'wpSave', - 'name' => 'wpSave', - 'type' => 'submit', - 'tabindex' => ++$tabindex, - 'value' => wfMessage( 'savearticle' )->text(), + 'id' => 'wpSave', + 'name' => 'wpSave', + 'type' => 'submit', + 'tabindex' => ++$tabindex, + 'value' => wfMessage( 'savearticle' )->text(), 'accesskey' => wfMessage( 'accesskey-save' )->text(), - 'title' => wfMessage( 'tooltip-save' )->text() . ' [' . wfMessage( 'accesskey-save' )->text() . ']', + 'title' => wfMessage( 'tooltip-save' )->text() . ' [' . wfMessage( 'accesskey-save' )->text() . ']', ); $buttons['save'] = Xml::element( 'input', $temp, '' ); ++$tabindex; // use the same for preview and live preview $temp = array( - 'id' => 'wpPreview', - 'name' => 'wpPreview', - 'type' => 'submit', - 'tabindex' => $tabindex, - 'value' => wfMessage( 'showpreview' )->text(), + 'id' => 'wpPreview', + 'name' => 'wpPreview', + 'type' => 'submit', + 'tabindex' => $tabindex, + 'value' => wfMessage( 'showpreview' )->text(), 'accesskey' => wfMessage( 'accesskey-preview' )->text(), - 'title' => wfMessage( 'tooltip-preview' )->text() . ' [' . wfMessage( 'accesskey-preview' )->text() . ']', + 'title' => wfMessage( 'tooltip-preview' )->text() . ' [' . wfMessage( 'accesskey-preview' )->text() . ']', ); $buttons['preview'] = Xml::element( 'input', $temp, '' ); $buttons['live'] = ''; $temp = array( - 'id' => 'wpDiff', - 'name' => 'wpDiff', - 'type' => 'submit', - 'tabindex' => ++$tabindex, - 'value' => wfMessage( 'showdiff' )->text(), + 'id' => 'wpDiff', + 'name' => 'wpDiff', + 'type' => 'submit', + 'tabindex' => ++$tabindex, + 'value' => wfMessage( 'showdiff' )->text(), 'accesskey' => wfMessage( 'accesskey-diff' )->text(), - 'title' => wfMessage( 'tooltip-diff' )->text() . ' [' . wfMessage( 'accesskey-diff' )->text() . ']', + 'title' => wfMessage( 'tooltip-diff' )->text() . ' [' . wfMessage( 'accesskey-diff' )->text() . ']', ); $buttons['diff'] = Xml::element( 'input', $temp, '' ); diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index af19b8e00c..0075bf5c6b 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -3189,7 +3189,7 @@ function wfBaseConvert( $input, $sourceBase, $destBase, $pad = 1, $lowercase = t return false; } - static $baseChars = array ( + static $baseChars = array( 10 => 'a', 11 => 'b', 12 => 'c', 13 => 'd', 14 => 'e', 15 => 'f', 16 => 'g', 17 => 'h', 18 => 'i', 19 => 'j', 20 => 'k', 21 => 'l', 22 => 'm', 23 => 'n', 24 => 'o', 25 => 'p', 26 => 'q', 27 => 'r', diff --git a/includes/LinksUpdate.php b/includes/LinksUpdate.php index f79b423054..f54487a5ab 100644 --- a/includes/LinksUpdate.php +++ b/includes/LinksUpdate.php @@ -840,7 +840,7 @@ class LinksDeletionUpdate extends SqlDataUpdate { $id = $this->mPage->getId(); # Delete restrictions for it - $this->mDb->delete( 'page_restrictions', array ( 'pr_page' => $id ), __METHOD__ ); + $this->mDb->delete( 'page_restrictions', array( 'pr_page' => $id ), __METHOD__ ); # Fix category table counts $cats = array(); diff --git a/includes/MagicWord.php b/includes/MagicWord.php index 41c7cb9242..86508ec128 100644 --- a/includes/MagicWord.php +++ b/includes/MagicWord.php @@ -149,7 +149,7 @@ class MagicWord { ); /* Array of caching hints for ParserCache */ - static public $mCacheTTLs = array ( + static public $mCacheTTLs = array( 'currentmonth' => 86400, 'currentmonth1' => 86400, 'currentmonthname' => 86400, diff --git a/includes/OutputPage.php b/includes/OutputPage.php index 4e4b73927e..8bf644353b 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -2672,7 +2672,7 @@ $templates ); $context = new ResourceLoaderContext( $resourceLoader, new FauxRequest( $query ) ); // Extract modules that know they're empty - $emptyModules = array (); + $emptyModules = array(); foreach ( $grpModules as $key => $module ) { if ( $module->isKnownEmpty( $context ) ) { $emptyModules[$key] = 'ready'; diff --git a/includes/PrefixSearch.php b/includes/PrefixSearch.php index d37d9e802a..e422a3b107 100644 --- a/includes/PrefixSearch.php +++ b/includes/PrefixSearch.php @@ -175,7 +175,7 @@ class PrefixSearch { $data = $module->getResultData(); // Reformat useful data for future printing by JSON engine - $srchres = array (); + $srchres = array(); foreach ( (array)$data['query']['allpages'] as $pageinfo ) { // Note: this data will no be printable by the xml engine // because it does not support lists of unnamed items diff --git a/includes/QueryPage.php b/includes/QueryPage.php index e1f24fa94f..b89ba0c4c9 100644 --- a/includes/QueryPage.php +++ b/includes/QueryPage.php @@ -416,7 +416,7 @@ abstract class QueryPage extends SpecialPage { */ function fetchFromCache( $limit, $offset = false ) { $dbr = wfGetDB( DB_SLAVE ); - $options = array (); + $options = array(); if ( $limit !== false ) { $options['LIMIT'] = intval( $limit ); } diff --git a/includes/api/ApiFeedContributions.php b/includes/api/ApiFeedContributions.php index 015a992258..42fb652047 100644 --- a/includes/api/ApiFeedContributions.php +++ b/includes/api/ApiFeedContributions.php @@ -149,7 +149,7 @@ class ApiFeedContributions extends ApiBase { public function getAllowedParams() { global $wgFeedClasses; $feedFormatNames = array_keys( $wgFeedClasses ); - return array ( + return array( 'feedformat' => array( ApiBase::PARAM_DFLT => 'rss', ApiBase::PARAM_TYPE => $feedFormatNames diff --git a/includes/api/ApiQueryAllImages.php b/includes/api/ApiQueryAllImages.php index e24b162c54..566c2087f3 100644 --- a/includes/api/ApiQueryAllImages.php +++ b/includes/api/ApiQueryAllImages.php @@ -260,7 +260,7 @@ class ApiQueryAllImages extends ApiQueryGeneratorBase { } public function getAllowedParams() { - return array ( + return array( 'sort' => array( ApiBase::PARAM_DFLT => 'name', ApiBase::PARAM_TYPE => array( diff --git a/includes/api/ApiQueryCategories.php b/includes/api/ApiQueryCategories.php index b2d3b1e4f7..5d714f5755 100644 --- a/includes/api/ApiQueryCategories.php +++ b/includes/api/ApiQueryCategories.php @@ -183,7 +183,7 @@ class ApiQueryCategories extends ApiQueryGeneratorBase { return array( 'prop' => array( ApiBase::PARAM_ISMULTI => true, - ApiBase::PARAM_TYPE => array ( + ApiBase::PARAM_TYPE => array( 'sortkey', 'timestamp', 'hidden', diff --git a/includes/api/ApiQueryCategoryMembers.php b/includes/api/ApiQueryCategoryMembers.php index 9dbd85937c..124908b4de 100644 --- a/includes/api/ApiQueryCategoryMembers.php +++ b/includes/api/ApiQueryCategoryMembers.php @@ -258,7 +258,7 @@ class ApiQueryCategoryMembers extends ApiQueryGeneratorBase { 'prop' => array( ApiBase::PARAM_DFLT => 'ids|title', ApiBase::PARAM_ISMULTI => true, - ApiBase::PARAM_TYPE => array ( + ApiBase::PARAM_TYPE => array( 'ids', 'title', 'sortkey', @@ -267,7 +267,7 @@ class ApiQueryCategoryMembers extends ApiQueryGeneratorBase { 'timestamp', ) ), - 'namespace' => array ( + 'namespace' => array( ApiBase::PARAM_ISMULTI => true, ApiBase::PARAM_TYPE => 'namespace', ), diff --git a/includes/api/ApiQueryFilearchive.php b/includes/api/ApiQueryFilearchive.php index 021074a9fb..c34859b4cb 100644 --- a/includes/api/ApiQueryFilearchive.php +++ b/includes/api/ApiQueryFilearchive.php @@ -218,7 +218,7 @@ class ApiQueryFilearchive extends ApiQueryBase { } public function getAllowedParams() { - return array ( + return array( 'from' => null, 'continue' => null, 'to' => null, diff --git a/includes/api/ApiQueryIWLinks.php b/includes/api/ApiQueryIWLinks.php index 6f03bbee45..7b13257572 100644 --- a/includes/api/ApiQueryIWLinks.php +++ b/includes/api/ApiQueryIWLinks.php @@ -90,7 +90,7 @@ class ApiQueryIWLinks extends ApiQueryBase { if ( count( $this->getPageSet()->getGoodTitles() ) == 1 ) { $this->addOption( 'ORDER BY', 'iwl_prefix' . $sort ); } else { - $this->addOption( 'ORDER BY', array ( + $this->addOption( 'ORDER BY', array( 'iwl_from' . $sort, 'iwl_prefix' . $sort, 'iwl_title' . $sort diff --git a/includes/api/ApiQueryORM.php b/includes/api/ApiQueryORM.php index 41d8f11c70..a23ff06b27 100644 --- a/includes/api/ApiQueryORM.php +++ b/includes/api/ApiQueryORM.php @@ -228,7 +228,7 @@ abstract class ApiQueryORM extends ApiQueryBase { * @return array */ public function getAllowedParams() { - $params = array ( + $params = array( 'props' => array( ApiBase::PARAM_TYPE => $this->getTable()->getFieldNames(), ApiBase::PARAM_ISMULTI => true, @@ -252,7 +252,7 @@ abstract class ApiQueryORM extends ApiQueryBase { * @return array */ public function getParamDescription() { - $descriptions = array ( + $descriptions = array( 'props' => 'Fields to query', 'continue' => 'Offset number from where to continue the query', 'limit' => 'Max amount of rows to return', diff --git a/includes/api/ApiQueryPagesWithProp.php b/includes/api/ApiQueryPagesWithProp.php index 0132fc3ed0..6f2f02e471 100644 --- a/includes/api/ApiQueryPagesWithProp.php +++ b/includes/api/ApiQueryPagesWithProp.php @@ -133,7 +133,7 @@ class ApiQueryPagesWithProp extends ApiQueryGeneratorBase { 'prop' => array( ApiBase::PARAM_DFLT => 'ids|title', ApiBase::PARAM_ISMULTI => true, - ApiBase::PARAM_TYPE => array ( + ApiBase::PARAM_TYPE => array( 'ids', 'title', 'value', diff --git a/includes/api/ApiQueryProtectedTitles.php b/includes/api/ApiQueryProtectedTitles.php index 4aa000073b..222ad0741a 100644 --- a/includes/api/ApiQueryProtectedTitles.php +++ b/includes/api/ApiQueryProtectedTitles.php @@ -157,7 +157,7 @@ class ApiQueryProtectedTitles extends ApiQueryGeneratorBase { ApiBase::PARAM_ISMULTI => true, ApiBase::PARAM_TYPE => array_diff( $wgRestrictionLevels, array( '' ) ) ), - 'limit' => array ( + 'limit' => array( ApiBase::PARAM_DFLT => 10, ApiBase::PARAM_TYPE => 'limit', ApiBase::PARAM_MIN => 1, diff --git a/includes/api/ApiQueryWatchlist.php b/includes/api/ApiQueryWatchlist.php index 90b12c140f..491d20f2ba 100644 --- a/includes/api/ApiQueryWatchlist.php +++ b/includes/api/ApiQueryWatchlist.php @@ -135,7 +135,7 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase { if ( !$params['allrev'] ) { $this->addTables( 'page' ); - $this->addJoinConds( array( 'page' => array( 'LEFT JOIN','rc_cur_id=page_id' ) ) ); + $this->addJoinConds( array( 'page' => array( 'LEFT JOIN', 'rc_cur_id=page_id' ) ) ); $this->addWhere( 'rc_this_oldid=page_latest OR rc_type=' . RC_LOG ); } @@ -321,7 +321,7 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase { 'end' => array( ApiBase::PARAM_TYPE => 'timestamp' ), - 'namespace' => array ( + 'namespace' => array( ApiBase::PARAM_ISMULTI => true, ApiBase::PARAM_TYPE => 'namespace' ), diff --git a/includes/api/ApiUpload.php b/includes/api/ApiUpload.php index 719032f2ce..9d30729c6f 100644 --- a/includes/api/ApiUpload.php +++ b/includes/api/ApiUpload.php @@ -143,7 +143,7 @@ class ApiUpload extends ApiBase { * @return array */ private function getStashResult( $warnings ) { - $result = array (); + $result = array(); // Some uploads can request they be stashed, so as not to publish them immediately. // In this case, a failure to stash ought to be fatal try { @@ -222,9 +222,9 @@ class ApiUpload extends ApiBase { $ok = JobQueueGroup::singleton()->push( new AssembleUploadChunksJob( Title::makeTitle( NS_FILE, $this->mParams['filekey'] ), array( - 'filename' => $this->mParams['filename'], - 'filekey' => $this->mParams['filekey'], - 'session' => $this->getContext()->exportSession() + 'filename' => $this->mParams['filename'], + 'filekey' => $this->mParams['filekey'], + 'session' => $this->getContext()->exportSession() ) ) ); if ( $ok ) { @@ -588,12 +588,12 @@ class ApiUpload extends ApiBase { $ok = JobQueueGroup::singleton()->push( new PublishStashedFileJob( Title::makeTitle( NS_FILE, $this->mParams['filename'] ), array( - 'filename' => $this->mParams['filename'], - 'filekey' => $this->mParams['filekey'], - 'comment' => $this->mParams['comment'], - 'text' => $this->mParams['text'], - 'watch' => $watch, - 'session' => $this->getContext()->exportSession() + 'filename' => $this->mParams['filename'], + 'filekey' => $this->mParams['filekey'], + 'comment' => $this->mParams['comment'], + 'text' => $this->mParams['text'], + 'watch' => $watch, + 'session' => $this->getContext()->exportSession() ) ) ); if ( $ok ) { diff --git a/includes/api/ApiUserrights.php b/includes/api/ApiUserrights.php index b9b1eeda68..80db29becc 100644 --- a/includes/api/ApiUserrights.php +++ b/includes/api/ApiUserrights.php @@ -83,7 +83,7 @@ class ApiUserrights extends ApiBase { } public function getAllowedParams() { - return array ( + return array( 'user' => array( ApiBase::PARAM_TYPE => 'string', ApiBase::PARAM_REQUIRED => true diff --git a/includes/media/DjVu.php b/includes/media/DjVu.php index a41521db6f..a7aa82f971 100644 --- a/includes/media/DjVu.php +++ b/includes/media/DjVu.php @@ -294,7 +294,7 @@ class DjVuHandler extends ImageHandler { } function isMetadataValid( $image, $metadata ) { - return !empty( $metadata ) && $metadata != serialize(array()); + return !empty( $metadata ) && $metadata != serialize( array() ); } function pageCount( $image ) { diff --git a/includes/media/XMPInfo.php b/includes/media/XMPInfo.php index 3b64fd339f..feacc2ad64 100644 --- a/includes/media/XMPInfo.php +++ b/includes/media/XMPInfo.php @@ -428,7 +428,7 @@ class XMPInfo { 'mode' => XMPReader::MODE_SIMPLE, 'validate' => 'validateClosed', /* can't use a range, as it skips... */ - 'choices' => array( '0' => true, '1' => true, + 'choices' => array( '0' => true, '1' => true, '2' => true, '3' => true, '4' => true, '9' => true, '10' => true, '11' => true, '12' => true, '13' => true, diff --git a/includes/profiler/Profiler.php b/includes/profiler/Profiler.php index c732b8d7a6..e39a7b238b 100644 --- a/includes/profiler/Profiler.php +++ b/includes/profiler/Profiler.php @@ -53,8 +53,8 @@ function wfProfileOut( $functionname = 'missing' ) { * @todo document */ class Profiler { - protected $mStack = array(), $mWorkStack = array (), $mCollated = array (), - $mCalls = array (), $mTotals = array (); + protected $mStack = array(), $mWorkStack = array(), $mCollated = array(), + $mCalls = array(), $mTotals = array(); protected $mTimeMetric = 'wall'; protected $mProfileID = false, $mCollateDone = false, $mTemplated = false; private static $__instance = null; @@ -257,11 +257,11 @@ class Profiler { if( count( $stack ) < 2 ) { return $stack; } - $outputs = array (); + $outputs = array(); for( $max = count( $stack ) - 1; $max > 0; ) { /* Find all items under this entry */ $level = $stack[$max][1]; - $working = array (); + $working = array(); for( $i = $max -1; $i >= 0; $i-- ) { if( $stack[$i][1] > $level ) { $working[] = $stack[$i]; @@ -557,9 +557,9 @@ class Profiler { $rc = $dbw->affectedRows(); if ( $rc == 0 ) { - $dbw->insert( 'profiling', array ( 'pf_name' => $name, 'pf_count' => $eventCount, + $dbw->insert( 'profiling', array( 'pf_name' => $name, 'pf_count' => $eventCount, 'pf_time' => $timeSum, 'pf_memory' => $memorySum, 'pf_server' => $pfhost ), - __METHOD__, array ( 'IGNORE' ) ); + __METHOD__, array( 'IGNORE' ) ); } // When we upgrade to mysql 4.1, the insert+update // can be merged into just a insert with this construct added: diff --git a/includes/search/SearchEngine.php b/includes/search/SearchEngine.php index c0fb278d67..cfd941a324 100644 --- a/includes/search/SearchEngine.php +++ b/includes/search/SearchEngine.php @@ -1119,7 +1119,7 @@ class SearchHighlighter { // if begin of the article contains the whole phrase, show only that !! if ( array_key_exists( $first, $snippets ) && preg_match( $pat1, $snippets[$first] ) && $offsets[$first] < $contextchars * 2 ) { - $snippets = array ( $first => $snippets[$first] ); + $snippets = array( $first => $snippets[$first] ); } // calc by how much to extend existing snippets diff --git a/includes/specials/SpecialAllpages.php b/includes/specials/SpecialAllpages.php index 7505df8924..1e1a56a0d6 100644 --- a/includes/specials/SpecialAllpages.php +++ b/includes/specials/SpecialAllpages.php @@ -312,7 +312,7 @@ class SpecialAllpages extends IncludableSpecialPage { $inpointf = $wgContLang->truncate( $inpointf, $this->maxPageLength ); $outpointf = $wgContLang->truncate( $outpointf, $this->maxPageLength ); - $queryParams = array ( + $queryParams = array( 'from' => $inpoint, 'to' => $outpoint, ); diff --git a/includes/specials/SpecialDisambiguations.php b/includes/specials/SpecialDisambiguations.php index 2126ca5201..0745c63f85 100644 --- a/includes/specials/SpecialDisambiguations.php +++ b/includes/specials/SpecialDisambiguations.php @@ -91,7 +91,7 @@ class DisambiguationsPage extends QueryPage { function getQueryInfo() { // @todo FIXME: What are pagelinks and p2 doing here? - return array ( + return array( 'tables' => array( 'templatelinks', 'p1' => 'page', diff --git a/includes/specials/SpecialDoubleRedirects.php b/includes/specials/SpecialDoubleRedirects.php index 5a5d749c75..7283e053f7 100644 --- a/includes/specials/SpecialDoubleRedirects.php +++ b/includes/specials/SpecialDoubleRedirects.php @@ -52,8 +52,8 @@ class DoubleRedirectsPage extends QueryPage { function reallyGetQueryInfo( $namespace = null, $title = null ) { $limitToTitle = !( $namespace === null && $title === null ); $dbr = wfGetDB( DB_SLAVE ); - $retval = array ( - 'tables' => array ( + $retval = array( + 'tables' => array( 'ra' => 'redirect', 'rb' => 'redirect', 'pa' => 'page', @@ -103,7 +103,7 @@ class DoubleRedirectsPage extends QueryPage { } function getOrderFields() { - return array ( 'ra.rd_namespace', 'ra.rd_title' ); + return array( 'ra.rd_namespace', 'ra.rd_title' ); } function formatResult( $skin, $result ) { diff --git a/includes/specials/SpecialFewestrevisions.php b/includes/specials/SpecialFewestrevisions.php index 5b7f353dbb..13e00ebf91 100644 --- a/includes/specials/SpecialFewestrevisions.php +++ b/includes/specials/SpecialFewestrevisions.php @@ -42,15 +42,15 @@ class FewestrevisionsPage extends QueryPage { } function getQueryInfo() { - return array ( - 'tables' => array ( 'revision', 'page' ), - 'fields' => array ( 'namespace' => 'page_namespace', + return array( + 'tables' => array( 'revision', 'page' ), + 'fields' => array( 'namespace' => 'page_namespace', 'title' => 'page_title', 'value' => 'COUNT(*)', 'redirect' => 'page_is_redirect' ), - 'conds' => array ( 'page_namespace' => MWNamespace::getContentNamespaces(), + 'conds' => array( 'page_namespace' => MWNamespace::getContentNamespaces(), 'page_id = rev_page' ), - 'options' => array ( 'HAVING' => 'COUNT(*) > 1', + 'options' => array( 'HAVING' => 'COUNT(*) > 1', // ^^^ This was probably here to weed out redirects. // Since we mark them as such now, it might be // useful to remove this. People _do_ create pages diff --git a/includes/specials/SpecialLinkSearch.php b/includes/specials/SpecialLinkSearch.php index af5b0a1bff..c9c2f6409a 100644 --- a/includes/specials/SpecialLinkSearch.php +++ b/includes/specials/SpecialLinkSearch.php @@ -100,8 +100,8 @@ class LinkSearchPage extends QueryPage { 'all' => '', 'label' => $this->msg( 'linksearch-ns' )->text() ), array( - 'name' => 'namespace', - 'id' => 'namespace', + 'name' => 'namespace', + 'id' => 'namespace', 'class' => 'namespaceselector', ) ); @@ -174,12 +174,12 @@ class LinkSearchPage extends QueryPage { $stripped = LinkFilter::keepOneWildcard( $this->mMungedQuery ); $like = $dbr->buildLike( $stripped ); - $retval = array ( - 'tables' => array ( 'page', 'externallinks' ), - 'fields' => array ( 'namespace' => 'page_namespace', + $retval = array( + 'tables' => array( 'page', 'externallinks' ), + 'fields' => array( 'namespace' => 'page_namespace', 'title' => 'page_title', 'value' => 'el_index', 'url' => 'el_to' ), - 'conds' => array ( 'page_id = el_from', + 'conds' => array( 'page_id = el_from', "$clause $like" ), 'options' => array( 'USE INDEX' => $clause ) ); diff --git a/includes/specials/SpecialListredirects.php b/includes/specials/SpecialListredirects.php index 0283767a36..32dd91498d 100644 --- a/includes/specials/SpecialListredirects.php +++ b/includes/specials/SpecialListredirects.php @@ -67,7 +67,7 @@ class ListredirectsPage extends QueryPage { } function getOrderFields() { - return array ( 'p1.page_namespace', 'p1.page_title' ); + return array( 'p1.page_namespace', 'p1.page_title' ); } /** diff --git a/includes/specials/SpecialLonelypages.php b/includes/specials/SpecialLonelypages.php index 8c6a88ac46..33f291b762 100644 --- a/includes/specials/SpecialLonelypages.php +++ b/includes/specials/SpecialLonelypages.php @@ -50,23 +50,23 @@ class LonelyPagesPage extends PageQueryPage { } function getQueryInfo() { - return array ( - 'tables' => array ( 'page', 'pagelinks', + return array( + 'tables' => array( 'page', 'pagelinks', 'templatelinks' ), - 'fields' => array ( 'namespace' => 'page_namespace', + 'fields' => array( 'namespace' => 'page_namespace', 'title' => 'page_title', 'value' => 'page_title' ), - 'conds' => array ( 'pl_namespace IS NULL', + 'conds' => array( 'pl_namespace IS NULL', 'page_namespace' => MWNamespace::getContentNamespaces(), 'page_is_redirect' => 0, 'tl_namespace IS NULL' ), - 'join_conds' => array ( - 'pagelinks' => array ( - 'LEFT JOIN', array ( + 'join_conds' => array( + 'pagelinks' => array( + 'LEFT JOIN', array( 'pl_namespace = page_namespace', 'pl_title = page_title' ) ), - 'templatelinks' => array ( - 'LEFT JOIN', array ( + 'templatelinks' => array( + 'LEFT JOIN', array( 'tl_namespace = page_namespace', 'tl_title = page_title' ) ) ) ); diff --git a/includes/specials/SpecialMostcategories.php b/includes/specials/SpecialMostcategories.php index 11f26bd76e..94903611e2 100644 --- a/includes/specials/SpecialMostcategories.php +++ b/includes/specials/SpecialMostcategories.php @@ -44,15 +44,15 @@ class MostcategoriesPage extends QueryPage { } function getQueryInfo() { - return array ( - 'tables' => array ( 'categorylinks', 'page' ), - 'fields' => array ( 'namespace' => 'page_namespace', + return array( + 'tables' => array( 'categorylinks', 'page' ), + 'fields' => array( 'namespace' => 'page_namespace', 'title' => 'page_title', 'value' => 'COUNT(*)' ), - 'conds' => array ( 'page_namespace' => MWNamespace::getContentNamespaces() ), - 'options' => array ( 'HAVING' => 'COUNT(*) > 1', + 'conds' => array( 'page_namespace' => MWNamespace::getContentNamespaces() ), + 'options' => array( 'HAVING' => 'COUNT(*) > 1', 'GROUP BY' => array( 'page_namespace', 'page_title' ) ), - 'join_conds' => array ( 'page' => array ( 'LEFT JOIN', + 'join_conds' => array( 'page' => array( 'LEFT JOIN', 'page_id = cl_from' ) ) ); } diff --git a/includes/specials/SpecialMostimages.php b/includes/specials/SpecialMostimages.php index 78b2d911f7..a961efd541 100644 --- a/includes/specials/SpecialMostimages.php +++ b/includes/specials/SpecialMostimages.php @@ -44,12 +44,12 @@ class MostimagesPage extends ImageQueryPage { } function getQueryInfo() { - return array ( - 'tables' => array ( 'imagelinks' ), - 'fields' => array ( 'namespace' => NS_FILE, + return array( + 'tables' => array( 'imagelinks' ), + 'fields' => array( 'namespace' => NS_FILE, 'title' => 'il_to', 'value' => 'COUNT(*)' ), - 'options' => array ( 'GROUP BY' => 'il_to', + 'options' => array( 'GROUP BY' => 'il_to', 'HAVING' => 'COUNT(*) > 1' ) ); } diff --git a/includes/specials/SpecialMostinterwikis.php b/includes/specials/SpecialMostinterwikis.php index 574a9afb96..abca9d7b2a 100644 --- a/includes/specials/SpecialMostinterwikis.php +++ b/includes/specials/SpecialMostinterwikis.php @@ -44,24 +44,24 @@ class MostinterwikisPage extends QueryPage { } function getQueryInfo() { - return array ( - 'tables' => array ( + return array( + 'tables' => array( 'langlinks', 'page' - ), 'fields' => array ( + ), 'fields' => array( 'namespace' => 'page_namespace', 'title' => 'page_title', 'value' => 'COUNT(*)' - ), 'conds' => array ( + ), 'conds' => array( 'page_namespace' => MWNamespace::getContentNamespaces() - ), 'options' => array ( + ), 'options' => array( 'HAVING' => 'COUNT(*) > 1', - 'GROUP BY' => array ( + 'GROUP BY' => array( 'page_namespace', 'page_title' ) - ), 'join_conds' => array ( - 'page' => array ( + ), 'join_conds' => array( + 'page' => array( 'LEFT JOIN', 'page_id = ll_from' ) diff --git a/includes/specials/SpecialMostlinked.php b/includes/specials/SpecialMostlinked.php index 4b6e56705f..473518fa15 100644 --- a/includes/specials/SpecialMostlinked.php +++ b/includes/specials/SpecialMostlinked.php @@ -45,17 +45,17 @@ class MostlinkedPage extends QueryPage { } function getQueryInfo() { - return array ( - 'tables' => array ( 'pagelinks', 'page' ), - 'fields' => array ( 'namespace' => 'pl_namespace', + return array( + 'tables' => array( 'pagelinks', 'page' ), + 'fields' => array( 'namespace' => 'pl_namespace', 'title' => 'pl_title', 'value' => 'COUNT(*)', 'page_namespace' ), - 'options' => array ( 'HAVING' => 'COUNT(*) > 1', + 'options' => array( 'HAVING' => 'COUNT(*) > 1', 'GROUP BY' => array( 'pl_namespace', 'pl_title', 'page_namespace' ) ), - 'join_conds' => array ( 'page' => array ( 'LEFT JOIN', - array ( 'page_namespace = pl_namespace', + 'join_conds' => array( 'page' => array( 'LEFT JOIN', + array( 'page_namespace = pl_namespace', 'page_title = pl_title' ) ) ) ); } diff --git a/includes/specials/SpecialMostlinkedcategories.php b/includes/specials/SpecialMostlinkedcategories.php index a1bce45d80..07c620bb1c 100644 --- a/includes/specials/SpecialMostlinkedcategories.php +++ b/includes/specials/SpecialMostlinkedcategories.php @@ -40,9 +40,9 @@ class MostlinkedCategoriesPage extends QueryPage { } function getQueryInfo() { - return array ( - 'tables' => array ( 'category' ), - 'fields' => array ( 'title' => 'cat_title', + return array( + 'tables' => array( 'category' ), + 'fields' => array( 'title' => 'cat_title', 'namespace' => NS_CATEGORY, 'value' => 'cat_pages' ), ); diff --git a/includes/specials/SpecialMostlinkedtemplates.php b/includes/specials/SpecialMostlinkedtemplates.php index 506e6b22a8..e5782d098a 100644 --- a/includes/specials/SpecialMostlinkedtemplates.php +++ b/includes/specials/SpecialMostlinkedtemplates.php @@ -62,12 +62,12 @@ class MostlinkedTemplatesPage extends QueryPage { } public function getQueryInfo() { - return array ( - 'tables' => array ( 'templatelinks' ), - 'fields' => array ( 'namespace' => 'tl_namespace', + return array( + 'tables' => array( 'templatelinks' ), + 'fields' => array( 'namespace' => 'tl_namespace', 'title' => 'tl_title', 'value' => 'COUNT(*)' ), - 'conds' => array ( 'tl_namespace' => NS_TEMPLATE ), + 'conds' => array( 'tl_namespace' => NS_TEMPLATE ), 'options' => array( 'GROUP BY' => array( 'tl_namespace', 'tl_title' ) ) ); } diff --git a/includes/specials/SpecialPopularpages.php b/includes/specials/SpecialPopularpages.php index 7ce8c13f41..61b2347273 100644 --- a/includes/specials/SpecialPopularpages.php +++ b/includes/specials/SpecialPopularpages.php @@ -42,7 +42,7 @@ class PopularPagesPage extends QueryPage { } function getQueryInfo() { - return array ( + return array( 'tables' => array( 'page' ), 'fields' => array( 'namespace' => 'page_namespace', 'title' => 'page_title', diff --git a/includes/specials/SpecialProtectedpages.php b/includes/specials/SpecialProtectedpages.php index 85f7893b4f..979c3eed79 100644 --- a/includes/specials/SpecialProtectedpages.php +++ b/includes/specials/SpecialProtectedpages.php @@ -92,7 +92,7 @@ class SpecialProtectedpages extends SpecialPage { $link = Linker::link( $title ); - $description_items = array (); + $description_items = array(); $protType = $this->msg( 'restriction-level-' . $row->pr_level )->escaped(); @@ -197,8 +197,8 @@ class SpecialProtectedpages extends SpecialPage { 'all' => '', 'label' => $this->msg( 'namespace' )->text() ), array( - 'name' => 'namespace', - 'id' => 'namespace', + 'name' => 'namespace', + 'id' => 'namespace', 'class' => 'namespaceselector', ) ) diff --git a/includes/specials/SpecialProtectedtitles.php b/includes/specials/SpecialProtectedtitles.php index 4700648b6c..87a08b44c2 100644 --- a/includes/specials/SpecialProtectedtitles.php +++ b/includes/specials/SpecialProtectedtitles.php @@ -91,7 +91,7 @@ class SpecialProtectedtitles extends SpecialPage { $link = Linker::link( $title ); - $description_items = array (); + $description_items = array(); $protType = $this->msg( 'restriction-level-' . $row->pt_create_perm )->escaped(); @@ -150,8 +150,8 @@ class SpecialProtectedtitles extends SpecialPage { 'all' => '', 'label' => $this->msg( 'namespace' )->text() ), array( - 'name' => 'namespace', - 'id' => 'namespace', + 'name' => 'namespace', + 'id' => 'namespace', 'class' => 'namespaceselector', ) ); diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php index 1bf5601441..644a575906 100644 --- a/includes/specials/SpecialSearch.php +++ b/includes/specials/SpecialSearch.php @@ -705,7 +705,7 @@ class SpecialSearch extends SpecialPage { $html = null; - if ( wfRunHooks( 'ShowSearchHit', array ( + if ( wfRunHooks( 'ShowSearchHit', array( $this, $result, $terms, &$link, &$redirect, &$section, &$extract, &$score, &$size, &$date, &$related, diff --git a/includes/specials/SpecialShortpages.php b/includes/specials/SpecialShortpages.php index 1be7fbed30..f409dd5bf5 100644 --- a/includes/specials/SpecialShortpages.php +++ b/includes/specials/SpecialShortpages.php @@ -38,15 +38,15 @@ class ShortPagesPage extends QueryPage { } function getQueryInfo() { - return array ( - 'tables' => array ( 'page' ), - 'fields' => array ( 'namespace' => 'page_namespace', + return array( + 'tables' => array( 'page' ), + 'fields' => array( 'namespace' => 'page_namespace', 'title' => 'page_title', 'value' => 'page_len' ), - 'conds' => array ( 'page_namespace' => + 'conds' => array( 'page_namespace' => MWNamespace::getContentNamespaces(), 'page_is_redirect' => 0 ), - 'options' => array ( 'USE INDEX' => 'page_redirect_namespace_len' ) + 'options' => array( 'USE INDEX' => 'page_redirect_namespace_len' ) ); } diff --git a/includes/specials/SpecialStatistics.php b/includes/specials/SpecialStatistics.php index e1d6e20f35..a362fa2230 100644 --- a/includes/specials/SpecialStatistics.php +++ b/includes/specials/SpecialStatistics.php @@ -229,11 +229,11 @@ class SpecialStatistics extends SpecialPage { Xml::closeElement( 'tr' ) . $this->formatRow( $this->msg( 'statistics-views-total' )->parse(), $this->getLanguage()->formatNum( $this->views ), - array ( 'class' => 'mw-statistics-views-total' ), 'statistics-views-total-desc' ) . + array( 'class' => 'mw-statistics-views-total' ), 'statistics-views-total-desc' ) . $this->formatRow( $this->msg( 'statistics-views-peredit' )->parse(), $this->getLanguage()->formatNum( sprintf( '%.2f', $this->edits ? $this->views / $this->edits : 0 ) ), - array ( 'class' => 'mw-statistics-views-peredit' ) ); + array( 'class' => 'mw-statistics-views-peredit' ) ); } private function getMostViewedPages() { diff --git a/includes/specials/SpecialUncategorizedimages.php b/includes/specials/SpecialUncategorizedimages.php index 53aa3f3417..3bfcedece3 100644 --- a/includes/specials/SpecialUncategorizedimages.php +++ b/includes/specials/SpecialUncategorizedimages.php @@ -47,7 +47,7 @@ class UncategorizedImagesPage extends ImageQueryPage { } function getQueryInfo() { - return array ( + return array( 'tables' => array( 'page', 'categorylinks' ), 'fields' => array( 'namespace' => 'page_namespace', 'title' => 'page_title', diff --git a/includes/specials/SpecialUncategorizedpages.php b/includes/specials/SpecialUncategorizedpages.php index b518e6fbb1..bfcb58f635 100644 --- a/includes/specials/SpecialUncategorizedpages.php +++ b/includes/specials/SpecialUncategorizedpages.php @@ -47,17 +47,17 @@ class UncategorizedPagesPage extends PageQueryPage { } function getQueryInfo() { - return array ( - 'tables' => array ( 'page', 'categorylinks' ), - 'fields' => array ( 'namespace' => 'page_namespace', + return array( + 'tables' => array( 'page', 'categorylinks' ), + 'fields' => array( 'namespace' => 'page_namespace', 'title' => 'page_title', 'value' => 'page_title' ), // default for page_namespace is all content namespaces (if requestedNamespace is false) // otherwise, page_namespace is requestedNamespace - 'conds' => array ( 'cl_from IS NULL', + 'conds' => array( 'cl_from IS NULL', 'page_namespace' => ( $this->requestedNamespace !== false ? $this->requestedNamespace : MWNamespace::getContentNamespaces() ), 'page_is_redirect' => 0 ), - 'join_conds' => array ( 'categorylinks' => array ( + 'join_conds' => array( 'categorylinks' => array( 'LEFT JOIN', 'cl_from = page_id' ) ) ); } diff --git a/includes/specials/SpecialUnusedcategories.php b/includes/specials/SpecialUnusedcategories.php index 6b91dd399e..82c4c11e84 100644 --- a/includes/specials/SpecialUnusedcategories.php +++ b/includes/specials/SpecialUnusedcategories.php @@ -39,15 +39,15 @@ class UnusedCategoriesPage extends QueryPage { } function getQueryInfo() { - return array ( - 'tables' => array ( 'page', 'categorylinks' ), - 'fields' => array ( 'namespace' => 'page_namespace', + return array( + 'tables' => array( 'page', 'categorylinks' ), + 'fields' => array( 'namespace' => 'page_namespace', 'title' => 'page_title', 'value' => 'page_title' ), - 'conds' => array ( 'cl_from IS NULL', + 'conds' => array( 'cl_from IS NULL', 'page_namespace' => NS_CATEGORY, 'page_is_redirect' => 0 ), - 'join_conds' => array ( 'categorylinks' => array ( + 'join_conds' => array( 'categorylinks' => array( 'LEFT JOIN', 'cl_to = page_title' ) ) ); } diff --git a/includes/specials/SpecialUnusedimages.php b/includes/specials/SpecialUnusedimages.php index 6955328277..d332db7562 100644 --- a/includes/specials/SpecialUnusedimages.php +++ b/includes/specials/SpecialUnusedimages.php @@ -45,28 +45,28 @@ class UnusedimagesPage extends ImageQueryPage { function getQueryInfo() { global $wgCountCategorizedImagesAsUsed; - $retval = array ( - 'tables' => array ( 'image', 'imagelinks' ), - 'fields' => array ( 'namespace' => NS_FILE, + $retval = array( + 'tables' => array( 'image', 'imagelinks' ), + 'fields' => array( 'namespace' => NS_FILE, 'title' => 'img_name', 'value' => 'img_timestamp', 'img_user', 'img_user_text', 'img_description' ), - 'conds' => array ( 'il_to IS NULL' ), - 'join_conds' => array ( 'imagelinks' => array ( + 'conds' => array( 'il_to IS NULL' ), + 'join_conds' => array( 'imagelinks' => array( 'LEFT JOIN', 'il_to = img_name' ) ) ); if ( $wgCountCategorizedImagesAsUsed ) { // Order is significant - $retval['tables'] = array ( 'image', 'page', 'categorylinks', + $retval['tables'] = array( 'image', 'page', 'categorylinks', 'imagelinks' ); $retval['conds']['page_namespace'] = NS_FILE; $retval['conds'][] = 'cl_from IS NULL'; $retval['conds'][] = 'img_name = page_title'; - $retval['join_conds']['categorylinks'] = array ( + $retval['join_conds']['categorylinks'] = array( 'LEFT JOIN', 'cl_from = page_id' ); - $retval['join_conds']['imagelinks'] = array ( + $retval['join_conds']['imagelinks'] = array( 'LEFT JOIN', 'il_to = page_title' ); } return $retval; diff --git a/includes/specials/SpecialUnusedtemplates.php b/includes/specials/SpecialUnusedtemplates.php index 493e936a8d..44c21c5624 100644 --- a/includes/specials/SpecialUnusedtemplates.php +++ b/includes/specials/SpecialUnusedtemplates.php @@ -48,16 +48,16 @@ class UnusedtemplatesPage extends QueryPage { } function getQueryInfo() { - return array ( - 'tables' => array ( 'page', 'templatelinks' ), - 'fields' => array ( 'namespace' => 'page_namespace', + return array( + 'tables' => array( 'page', 'templatelinks' ), + 'fields' => array( 'namespace' => 'page_namespace', 'title' => 'page_title', 'value' => 'page_title' ), - 'conds' => array ( 'page_namespace' => NS_TEMPLATE, + 'conds' => array( 'page_namespace' => NS_TEMPLATE, 'tl_from IS NULL', 'page_is_redirect' => 0 ), - 'join_conds' => array ( 'templatelinks' => array ( - 'LEFT JOIN', array ( 'tl_title = page_title', + 'join_conds' => array( 'templatelinks' => array( + 'LEFT JOIN', array( 'tl_title = page_title', 'tl_namespace = page_namespace' ) ) ) ); } diff --git a/includes/specials/SpecialUnwatchedpages.php b/includes/specials/SpecialUnwatchedpages.php index 05ec6b02e4..97fa3f181b 100644 --- a/includes/specials/SpecialUnwatchedpages.php +++ b/includes/specials/SpecialUnwatchedpages.php @@ -44,17 +44,17 @@ class UnwatchedpagesPage extends QueryPage { } function getQueryInfo() { - return array ( - 'tables' => array ( 'page', 'watchlist' ), - 'fields' => array ( 'namespace' => 'page_namespace', + return array( + 'tables' => array( 'page', 'watchlist' ), + 'fields' => array( 'namespace' => 'page_namespace', 'title' => 'page_title', 'value' => 'page_namespace' ), - 'conds' => array ( 'wl_title IS NULL', + 'conds' => array( 'wl_title IS NULL', 'page_is_redirect' => 0, "page_namespace != '" . NS_MEDIAWIKI . "'" ), - 'join_conds' => array ( 'watchlist' => array ( - 'LEFT JOIN', array ( 'wl_title = page_title', + 'join_conds' => array( 'watchlist' => array( + 'LEFT JOIN', array( 'wl_title = page_title', 'wl_namespace = page_namespace' ) ) ) ); } diff --git a/includes/specials/SpecialWantedcategories.php b/includes/specials/SpecialWantedcategories.php index 0035bfabfb..85b4ec3d75 100644 --- a/includes/specials/SpecialWantedcategories.php +++ b/includes/specials/SpecialWantedcategories.php @@ -35,15 +35,15 @@ class WantedCategoriesPage extends WantedQueryPage { } function getQueryInfo() { - return array ( - 'tables' => array ( 'categorylinks', 'page' ), - 'fields' => array ( 'namespace' => NS_CATEGORY, + return array( + 'tables' => array( 'categorylinks', 'page' ), + 'fields' => array( 'namespace' => NS_CATEGORY, 'title' => 'cl_to', 'value' => 'COUNT(*)' ), - 'conds' => array ( 'page_title IS NULL' ), - 'options' => array ( 'GROUP BY' => 'cl_to' ), - 'join_conds' => array ( 'page' => array ( 'LEFT JOIN', - array ( 'page_title = cl_to', + 'conds' => array( 'page_title IS NULL' ), + 'options' => array( 'GROUP BY' => 'cl_to' ), + 'join_conds' => array( 'page' => array( 'LEFT JOIN', + array( 'page_title = cl_to', 'page_namespace' => NS_CATEGORY ) ) ) ); } diff --git a/includes/specials/SpecialWantedfiles.php b/includes/specials/SpecialWantedfiles.php index 9a2d30a3d8..b5c1fdbeb7 100644 --- a/includes/specials/SpecialWantedfiles.php +++ b/includes/specials/SpecialWantedfiles.php @@ -73,16 +73,16 @@ class WantedFilesPage extends WantedQueryPage { } function getQueryInfo() { - return array ( - 'tables' => array ( 'imagelinks', 'image' ), - 'fields' => array ( 'namespace' => NS_FILE, + return array( + 'tables' => array( 'imagelinks', 'image' ), + 'fields' => array( 'namespace' => NS_FILE, 'title' => 'il_to', 'value' => 'COUNT(*)' ), - 'conds' => array ( 'img_name IS NULL' ), - 'options' => array ( 'GROUP BY' => 'il_to' ), - 'join_conds' => array ( 'image' => - array ( 'LEFT JOIN', - array ( 'il_to = img_name' ) + 'conds' => array( 'img_name IS NULL' ), + 'options' => array( 'GROUP BY' => 'il_to' ), + 'join_conds' => array( 'image' => + array( 'LEFT JOIN', + array( 'il_to = img_name' ) ) ) ); diff --git a/includes/specials/SpecialWantedtemplates.php b/includes/specials/SpecialWantedtemplates.php index f5539c1812..d13fa0318b 100644 --- a/includes/specials/SpecialWantedtemplates.php +++ b/includes/specials/SpecialWantedtemplates.php @@ -38,17 +38,17 @@ class WantedTemplatesPage extends WantedQueryPage { } function getQueryInfo() { - return array ( - 'tables' => array ( 'templatelinks', 'page' ), - 'fields' => array ( 'namespace' => 'tl_namespace', + return array( + 'tables' => array( 'templatelinks', 'page' ), + 'fields' => array( 'namespace' => 'tl_namespace', 'title' => 'tl_title', 'value' => 'COUNT(*)' ), - 'conds' => array ( 'page_title IS NULL', + 'conds' => array( 'page_title IS NULL', 'tl_namespace' => NS_TEMPLATE ), - 'options' => array ( + 'options' => array( 'GROUP BY' => array( 'tl_namespace', 'tl_title' ) ), - 'join_conds' => array ( 'page' => array ( 'LEFT JOIN', - array ( 'page_namespace = tl_namespace', + 'join_conds' => array( 'page' => array( 'LEFT JOIN', + array( 'page_namespace = tl_namespace', 'page_title = tl_title' ) ) ) ); } diff --git a/includes/specials/SpecialWithoutinterwiki.php b/includes/specials/SpecialWithoutinterwiki.php index 329b1adacc..c18c963400 100644 --- a/includes/specials/SpecialWithoutinterwiki.php +++ b/includes/specials/SpecialWithoutinterwiki.php @@ -78,15 +78,15 @@ class WithoutInterwikiPage extends PageQueryPage { } function getQueryInfo() { - $query = array ( - 'tables' => array ( 'page', 'langlinks' ), - 'fields' => array ( 'namespace' => 'page_namespace', + $query = array( + 'tables' => array( 'page', 'langlinks' ), + 'fields' => array( 'namespace' => 'page_namespace', 'title' => 'page_title', 'value' => 'page_title' ), - 'conds' => array ( 'll_title IS NULL', + 'conds' => array( 'll_title IS NULL', 'page_namespace' => MWNamespace::getContentNamespaces(), 'page_is_redirect' => 0 ), - 'join_conds' => array ( 'langlinks' => array ( + 'join_conds' => array( 'langlinks' => array( 'LEFT JOIN', 'll_from = page_id' ) ) ); if ( $this->prefix ) { diff --git a/languages/classes/LanguageEo.php b/languages/classes/LanguageEo.php index 8f8432242b..6cddddbcfc 100644 --- a/languages/classes/LanguageEo.php +++ b/languages/classes/LanguageEo.php @@ -78,7 +78,7 @@ class LanguageEo extends Language { * @return string */ function strrtuxCallback( $matches ) { - static $ux = array ( + static $ux = array( 'x' => 'xx' , 'X' => 'Xx' , "\xc4\x88" => "Cx" , "\xc4\x89" => "cx" , "\xc4\x9c" => "Gx" , "\xc4\x9d" => "gx" , @@ -95,7 +95,7 @@ class LanguageEo extends Language { * @return string */ function strrtxuCallback( $matches ) { - static $xu = array ( + static $xu = array( 'xx' => 'x' , 'xX' => 'x' , 'Xx' => 'X' , 'XX' => 'X' , "Cx" => "\xc4\x88" , "CX" => "\xc4\x88" , diff --git a/maintenance/benchmarks/bench_utf8_title_check.php b/maintenance/benchmarks/bench_utf8_title_check.php index f59878003a..7bb44b404b 100644 --- a/maintenance/benchmarks/bench_utf8_title_check.php +++ b/maintenance/benchmarks/bench_utf8_title_check.php @@ -38,7 +38,7 @@ class bench_utf8_title_check extends Benchmarker { public function __construct() { parent::__construct(); - $this->data = array ( + $this->data = array( "", "United States of America", // 7bit ASCII "S%C3%A9rie%20t%C3%A9l%C3%A9vis%C3%A9e", diff --git a/maintenance/storage/compressOld.php b/maintenance/storage/compressOld.php index 8d372e1995..b0cbf28c65 100644 --- a/maintenance/storage/compressOld.php +++ b/maintenance/storage/compressOld.php @@ -53,7 +53,7 @@ class CompressOld extends Maintenance { * @todo document */ const LS_INDIVIDUAL = 0; - const LS_CHUNKED = 1; + const LS_CHUNKED = 1; public function __construct() { parent::__construct(); @@ -113,7 +113,7 @@ class CompressOld extends Maintenance { $this->output( "Starting from old_id $start...\n" ); $dbw = wfGetDB( DB_MASTER ); do { - $res = $dbw->select( 'text', array( 'old_id','old_flags','old_text' ), + $res = $dbw->select( 'text', array( 'old_id', 'old_flags', 'old_text' ), "old_id>=$start", __METHOD__, array( 'ORDER BY' => 'old_id', 'LIMIT' => $chunksize, 'FOR UPDATE' ) ); if( $res->numRows() == 0 ) { break; @@ -254,8 +254,8 @@ class CompressOld extends Maintenance { # Get the page row $pageRes = $dbr->select( 'page', - array('page_id', 'page_namespace', 'page_title','page_latest'), - $pageConds + array('page_id' => $pageId), __METHOD__ ); + array( 'page_id', 'page_namespace', 'page_title', 'page_latest' ), + $pageConds + array( 'page_id' => $pageId ), __METHOD__ ); if ( $pageRes->numRows() == 0 ) { continue; } @@ -365,7 +365,7 @@ class CompressOld extends Maintenance { array( /* SET */ 'old_text' => $url, 'old_flags' => 'external,utf-8', - ), array ( /* WHERE */ + ), array( /* WHERE */ 'old_id' => $stub->getReferrer(), ) ); diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php index ae97a8a911..c5f9389061 100644 --- a/skins/CologneBlue.php +++ b/skins/CologneBlue.php @@ -234,7 +234,7 @@ class CologneBlueTemplate extends BaseTemplate { // Use the regular navigational link, but replace its text. Everything else stays unmodified. $namespacesLinks = $this->data['content_navigation']['namespaces']; - return $this->processBottomLink( $message, $namespacesLinks[$key], $message ); + return $this->processBottomLink( $message, $namespacesLinks[$key], $message ); } /** @@ -376,7 +376,7 @@ class CologneBlueTemplate extends BaseTemplate { ); $personalUrls = $this->getPersonalTools(); - foreach ( array ( 'logout', 'createaccount', 'login', 'anonlogin' ) as $key ) { + foreach ( array( 'logout', 'createaccount', 'login', 'anonlogin' ) as $key ) { if ( $personalUrls[$key] ) { $s[] = $this->makeListItem( $key, $personalUrls[$key], array( 'tag' => 'span' ) ); } @@ -417,7 +417,7 @@ class CologneBlueTemplate extends BaseTemplate { // Personal tools ("My pages") $qbmyoptions = $this->getPersonalTools(); - foreach ( array ( 'logout', 'createaccount', 'login', 'anonlogin' ) as $key ) { + foreach ( array( 'logout', 'createaccount', 'login', 'anonlogin' ) as $key ) { $qbmyoptions[$key] = null; } diff --git a/skins/MonoBook.php b/skins/MonoBook.php index f03d31b8b8..ecbcd70a34 100644 --- a/skins/MonoBook.php +++ b/skins/MonoBook.php @@ -205,18 +205,18 @@ echo $footerEnd; global $wgUseTwoButtonsSearchForm; ?>