| Index: trunk/phase3/tests/phpunit/includes/api/ApiQueryTest.php |
| — | — | @@ -50,7 +50,6 @@ |
| 51 | 51 | 'action' => 'query', |
| 52 | 52 | 'titles' => $title . '|Talk:' ) ); |
| 53 | 53 | |
| 54 | | - |
| 55 | 54 | $this->assertArrayHasKey( 'query', $data[0] ); |
| 56 | 55 | $this->assertArrayHasKey( 'pages', $data[0]['query'] ); |
| 57 | 56 | $this->assertEquals( 2, count( $data[0]['query']['pages'] ) ); |
| — | — | @@ -60,8 +59,6 @@ |
| 61 | 60 | |
| 62 | 61 | $this->assertArrayHasKey( 'missing', $data[0]['query']['pages'][-2] ); |
| 63 | 62 | $this->assertArrayHasKey( 'invalid', $data[0]['query']['pages'][-1] ); |
| 64 | | - |
| 65 | | - |
| 66 | 63 | } |
| 67 | 64 | |
| 68 | 65 | } |
| Index: trunk/extensions/HeaderTabs/HeaderTabs_body.yui.php |
| — | — | @@ -106,16 +106,20 @@ |
| 107 | 107 | return true; |
| 108 | 108 | } |
| 109 | 109 | |
| 110 | | - public static function addHTMLHeader( &$wgOut ) { |
| | 110 | + /** |
| | 111 | + * @param $out OutputPage |
| | 112 | + * @return bool |
| | 113 | + */ |
| | 114 | + public static function addHTMLHeader( &$out ) { |
| 111 | 115 | global $htScriptPath, $htUseHistory; |
| 112 | 116 | |
| 113 | 117 | if ( $htUseHistory ) { |
| 114 | | - $wgOut->addScript( '<script type="text/javascript" src="'.$htScriptPath.'/skins-yui/combined-history-min.js"></script>' ); |
| | 118 | + $out->addScript( '<script type="text/javascript" src="'.$htScriptPath.'/skins-yui/combined-history-min.js"></script>' ); |
| 115 | 119 | } else { |
| 116 | | - $wgOut->addScript( '<script type="text/javascript" src="'.$htScriptPath.'/skins-yui/combined-min.js"></script>' ); |
| | 120 | + $out->addScript( '<script type="text/javascript" src="'.$htScriptPath.'/skins-yui/combined-min.js"></script>' ); |
| 117 | 121 | } |
| 118 | 122 | |
| 119 | | - $wgOut->addLink( array( |
| | 123 | + $out->addLink( array( |
| 120 | 124 | 'rel' => 'stylesheet', |
| 121 | 125 | 'type' => 'text/css', |
| 122 | 126 | 'media' => 'screen, projection', |
| — | — | @@ -142,4 +146,4 @@ |
| 143 | 147 | return $parser->insertStripItem( $output, $parser->mStripState ); |
| 144 | 148 | } |
| 145 | 149 | |
| 146 | | -} |
| \ No newline at end of file |
| | 150 | +} |
| Index: trunk/extensions/HeaderTabs/HeaderTabs_body.jq.php |
| — | — | @@ -256,20 +256,24 @@ |
| 257 | 257 | return true; |
| 258 | 258 | } |
| 259 | 259 | |
| 260 | | - public static function addHTMLHeader( &$wgOut ) { |
| | 260 | + /** |
| | 261 | + * @param $out OutputPage |
| | 262 | + * @return bool |
| | 263 | + */ |
| | 264 | + public static function addHTMLHeader( &$out ) { |
| 261 | 265 | global $htScriptPath,$htStyle; |
| 262 | 266 | |
| 263 | 267 | wfDebugLog('headertabs', __METHOD__.': loading javascript'); |
| 264 | 268 | |
| 265 | 269 | //! @todo we might be able to only load our js and styles if we are rendering tabs, speeding up pages that don't use it? but what about cached pages? (2011-12-12, ofb) |
| 266 | 270 | |
| 267 | | - $wgOut->addModules( 'ext.headertabs' ); |
| | 271 | + $out->addModules( 'ext.headertabs' ); |
| 268 | 272 | |
| 269 | 273 | // add the stylesheet for our perticular style |
| 270 | 274 | if (!empty($htStyle) && $htStyle !== 'jquery') { |
| 271 | 275 | $styleFile = $htScriptPath.'/skins-jquery/ext.headertabs.'.$htStyle.'.css'; |
| 272 | 276 | wfDebugLog('headertabs', __METHOD__.': including style file: '.$styleFile); |
| 273 | | - $wgOut->addExtensionStyle( $styleFile ); |
| | 277 | + $out->addExtensionStyle( $styleFile ); |
| 274 | 278 | } |
| 275 | 279 | |
| 276 | 280 | return true; |
| — | — | @@ -292,4 +296,4 @@ |
| 293 | 297 | return $parser->insertStripItem( $output, $parser->mStripState ); |
| 294 | 298 | } |
| 295 | 299 | |
| 296 | | -} |
| \ No newline at end of file |
| | 300 | +} |
| Index: trunk/extensions/ShortUrl/populateShortUrlTable.php |
| — | — | @@ -14,8 +14,8 @@ |
| 15 | 15 | |
| 16 | 16 | private function insertRows( $a ) { |
| 17 | 17 | $dbw = wfGetDB( DB_MASTER ); |
| 18 | | - $dbw->insert( |
| 19 | | - 'shorturls', |
| | 18 | + $dbw->insert( |
| | 19 | + 'shorturls', |
| 20 | 20 | $a, |
| 21 | 21 | __METHOD__, |
| 22 | 22 | array( 'IGNORE' ) |
| — | — | @@ -29,7 +29,6 @@ |
| 30 | 30 | |
| 31 | 31 | $last_processed_id = 0; |
| 32 | 32 | |
| 33 | | - |
| 34 | 33 | while( true ) { |
| 35 | 34 | $insertBuffer = array(); |
| 36 | 35 | $res = $dbr->select( |
| — | — | @@ -41,7 +40,7 @@ |
| 42 | 41 | ); |
| 43 | 42 | if( $res->numRows() == 0 ) { |
| 44 | 43 | break; |
| 45 | | - } |
| | 44 | + } |
| 46 | 45 | |
| 47 | 46 | foreach( $res as $row ) { |
| 48 | 47 | $rowCount++; |