| Index: branches/REL1_17/phase3/maintenance/renamewiki.php |
| — | — | @@ -57,7 +57,7 @@ |
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | if ( count( $stores ) ) { |
| 61 | | - $this->output( "Initialising external storage $store...\n" ); |
| | 61 | + $this->output( "Initialising external storage...\n" ); |
| 62 | 62 | global $wgDBuser, $wgDBpassword, $wgExternalServers; |
| 63 | 63 | foreach ( $stores as $storeURL ) { |
| 64 | 64 | $m = array(); |
| Index: branches/REL1_17/phase3/maintenance/storage/recompressTracked.php |
| — | — | @@ -610,7 +610,7 @@ |
| 611 | 611 | foreach ( $res as $row ) { |
| 612 | 612 | $text = Revision::getRevisionText( $row ); |
| 613 | 613 | if ( $text === false ) { |
| 614 | | - $this->critical( "Error: cannot load revision text for old_id=$textId" ); |
| | 614 | + $this->critical( "Error: cannot load revision text for old_id={$row->old_id}" ); |
| 615 | 615 | continue; |
| 616 | 616 | } |
| 617 | 617 | |
| Index: branches/REL1_17/phase3/maintenance/minify.php |
| — | — | @@ -74,7 +74,7 @@ |
| 75 | 75 | public function getExtension( $fileName ) { |
| 76 | 76 | $dotPos = strrpos( $fileName, '.' ); |
| 77 | 77 | if ( $dotPos === false ) { |
| 78 | | - $this->error( "No file extension, cannot determine type: $arg" ); |
| | 78 | + $this->error( "No file extension, cannot determine type: $fileName" ); |
| 79 | 79 | exit( 1 ); |
| 80 | 80 | } |
| 81 | 81 | return substr( $fileName, $dotPos + 1 ); |
| Index: branches/REL1_17/phase3/maintenance/refreshLinks.php |
| — | — | @@ -91,6 +91,7 @@ |
| 92 | 92 | $num = $dbr->numRows( $res ); |
| 93 | 93 | $this->output( "Refreshing $num old redirects from $start...\n" ); |
| 94 | 94 | |
| | 95 | + $i = 0; |
| 95 | 96 | foreach ( $res as $row ) { |
| 96 | 97 | if ( !( ++$i % $reportingInterval ) ) { |
| 97 | 98 | $this->output( "$i\n" ); |
| Index: branches/REL1_17/phase3/maintenance/tests/RunSeleniumTests.php |
| — | — | @@ -140,9 +140,9 @@ |
| 141 | 141 | public function execute() { |
| 142 | 142 | global $wgServer, $wgScriptPath, $wgHooks; |
| 143 | 143 | |
| 144 | | - $seleniumSettings; |
| 145 | | - $seleniumBrowsers; |
| 146 | | - $seleniumTestSuites; |
| | 144 | + $seleniumSettings = array(); |
| | 145 | + $seleniumBrowsers = array(); |
| | 146 | + $seleniumTestSuites = array(); |
| 147 | 147 | |
| 148 | 148 | $configFile = $this->getOption( 'seleniumConfig', '' ); |
| 149 | 149 | if ( strlen( $configFile ) > 0 ) { |
| Index: branches/REL1_17/phase3/maintenance/addwiki.php |
| — | — | @@ -90,7 +90,7 @@ |
| 91 | 91 | # Initialise external storage |
| 92 | 92 | if ( is_array( $wgDefaultExternalStore ) ) { |
| 93 | 93 | $stores = $wgDefaultExternalStore; |
| 94 | | - } elseif ( $stores ) { |
| | 94 | + } elseif ( $wgDefaultExternalStore ) { |
| 95 | 95 | $stores = array( $wgDefaultExternalStore ); |
| 96 | 96 | } else { |
| 97 | 97 | $stores = array(); |
| Index: branches/REL1_17/phase3/maintenance/checkUsernames.php |
| — | — | @@ -45,7 +45,7 @@ |
| 46 | 46 | foreach ( $res as $row ) { |
| 47 | 47 | if ( ! User::isValidUserName( $row->user_name ) ) { |
| 48 | 48 | $this->error( sprintf( "%s: %6d: '%s'\n", wfWikiID(), $row->user_id, $row->user_name ) ); |
| 49 | | - wfDebugLog( 'checkUsernames', $out ); |
| | 49 | + wfDebugLog( 'checkUsernames', $row->user_name ); |
| 50 | 50 | } |
| 51 | 51 | } |
| 52 | 52 | } |
| Index: branches/REL1_17/phase3/maintenance/dumpInterwiki.php |
| — | — | @@ -148,7 +148,7 @@ |
| 149 | 149 | $this->makeLanguageLinks ( $site, "_" . $site->suffix ); |
| 150 | 150 | } |
| 151 | 151 | |
| 152 | | - foreach ( $dblist as $db ) { |
| | 152 | + foreach ( $this->dblist as $db ) { |
| 153 | 153 | if ( isset( $this->specials[$db] ) ) { |
| 154 | 154 | # Special wiki |
| 155 | 155 | # Has interwiki links and interlanguage links to wikipedia |
| Index: branches/REL1_17/phase3/includes/parser/LinkHolderArray.php |
| — | — | @@ -348,7 +348,7 @@ |
| 349 | 349 | continue; |
| 350 | 350 | } |
| 351 | 351 | $linkBatch->addObj( $variantTitle ); |
| 352 | | - $variantMap[$variantTitle->getPrefixedDBkey()][] = $key; |
| | 352 | + $variantMap[$variantTitle->getPrefixedDBkey()][] = $titlesAttrs[$i]['key']; |
| 353 | 353 | } |
| 354 | 354 | } |
| 355 | 355 | } |
| Index: branches/REL1_17/phase3/includes/db/DatabaseIbm_db2.php |
| — | — | @@ -949,7 +949,7 @@ |
| 950 | 950 | $overhead = "SAVEPOINT $ignore ON ROLLBACK RETAIN CURSORS"; |
| 951 | 951 | db2_exec( $this->mConn, $overhead, $this->mStmtOptions ); |
| 952 | 952 | |
| 953 | | - $this->execute( $stmt, $row ); |
| | 953 | + $res2 = $this->execute( $stmt, $row ); |
| 954 | 954 | |
| 955 | 955 | if ( !$res2 ) { |
| 956 | 956 | $this->installPrint( 'Last error:' ); |
| Index: branches/REL1_17/phase3/includes/Feed.php |
| — | — | @@ -101,7 +101,7 @@ |
| 102 | 102 | */ |
| 103 | 103 | public function setUniqueId($uniqueId, $RSSisPermalink = False) { |
| 104 | 104 | $this->UniqueId = $uniqueId; |
| 105 | | - $this->RSSIsPermalink = $isPermalink; |
| | 105 | + $this->RSSIsPermalink = $RSSisPermalink; |
| 106 | 106 | } |
| 107 | 107 | |
| 108 | 108 | /** |
| Index: branches/REL1_17/phase3/includes/LogEventsList.php |
| — | — | @@ -1091,7 +1091,7 @@ |
| 1092 | 1092 | public function show() { |
| 1093 | 1093 | global $wgOut; |
| 1094 | 1094 | # Set title and add header |
| 1095 | | - $this->list->showHeader( $pager->getType() ); |
| | 1095 | + $this->list->showHeader( $this->pager->getType() ); |
| 1096 | 1096 | # Show form options |
| 1097 | 1097 | $this->list->showOptions( $this->pager->getType(), $this->pager->getUser(), $this->pager->getPage(), |
| 1098 | 1098 | $this->pager->getPattern(), $this->pager->getYear(), $this->pager->getMonth() ); |
| Index: branches/REL1_17/phase3/includes/api/ApiQueryCategories.php |
| — | — | @@ -132,8 +132,8 @@ |
| 133 | 133 | |
| 134 | 134 | $res = $this->select( __METHOD__ ); |
| 135 | 135 | |
| | 136 | + $count = 0; |
| 136 | 137 | if ( is_null( $resultPageSet ) ) { |
| 137 | | - $count = 0; |
| 138 | 138 | foreach ( $res as $row ) { |
| 139 | 139 | if ( ++$count > $params['limit'] ) { |
| 140 | 140 | // We've reached the one extra which shows that |