| Index: trunk/phase3/includes/SpecialAllpages.php |
| — | — | @@ -130,7 +130,7 @@ |
| 131 | 131 | $res = $dbr->select( |
| 132 | 132 | 'page', /* FROM */ |
| 133 | 133 | 'page_title', /* WHAT */ |
| 134 | | - $where + array( $chunk), |
| | 134 | + $where + array($chunk), |
| 135 | 135 | __METHOD__, |
| 136 | 136 | array ('LIMIT' => 2, 'OFFSET' => $this->maxPerPage - 1, 'ORDER BY' => 'page_title') ); |
| 137 | 137 | |
| — | — | @@ -174,7 +174,7 @@ |
| 175 | 175 | $out .= $this->showline ( $inpoint, $outpoint, $namespace, false ); |
| 176 | 176 | } |
| 177 | 177 | $out .= '</table>'; |
| 178 | | - $nsForm = $this->namespaceForm ( $namespace, '', false ); |
| | 178 | + $nsForm = $this->namespaceForm( $namespace, '', false ); |
| 179 | 179 | |
| 180 | 180 | # Is there more? |
| 181 | 181 | if ( $including ) { |
| — | — | @@ -319,7 +319,7 @@ |
| 320 | 320 | } |
| 321 | 321 | } |
| 322 | 322 | |
| 323 | | - $nsForm = $this->namespaceForm ( $namespace, $from ); |
| | 323 | + $nsForm = $this->namespaceForm( $namespace, $from ); |
| 324 | 324 | $out2 = '<table style="background: inherit;" width="100%" cellpadding="0" cellspacing="0" border="0">'; |
| 325 | 325 | $out2 .= '<tr valign="top"><td>' . $nsForm; |
| 326 | 326 | $out2 .= '</td><td align="' . $align . '" style="font-size: smaller; margin-bottom: 1em;">' . |
| Index: trunk/phase3/includes/SpecialWhatlinkshere.php |
| — | — | @@ -25,9 +25,9 @@ |
| 26 | 26 | |
| 27 | 27 | private $namespace; |
| 28 | 28 | |
| 29 | | - function WhatLinksHerePage( &$request, $par = null ) { |
| | 29 | + function WhatLinksHerePage( $request, $par = null ) { |
| 30 | 30 | global $wgUser; |
| 31 | | - $this->request =& $request; |
| | 31 | + $this->request = $request; |
| 32 | 32 | $this->skin = $wgUser->getSkin(); |
| 33 | 33 | $this->par = $par; |
| 34 | 34 | } |
| Index: trunk/phase3/includes/SpecialMostlinkedtemplates.php |
| — | — | @@ -69,15 +69,14 @@ |
| 70 | 70 | * @param Database $dbr Database connection |
| 71 | 71 | * @param int $res Result pointer |
| 72 | 72 | */ |
| 73 | | - public function preprocessResults( $dbr, $res ) { |
| | 73 | + public function preprocessResults( $db, $res ) { |
| 74 | 74 | $batch = new LinkBatch(); |
| 75 | | - while( $row = $dbr->fetchObject( $res ) ) { |
| 76 | | - $title = Title::makeTitleSafe( $row->namespace, $row->title ); |
| 77 | | - $batch->addObj( $title ); |
| | 75 | + while( $row = $db->fetchObject( $res ) ) { |
| | 76 | + $batch->add( $row->namespace, $row->title ); |
| 78 | 77 | } |
| 79 | 78 | $batch->execute(); |
| 80 | | - if( $dbr->numRows( $res ) > 0 ) |
| 81 | | - $dbr->dataSeek( $res, 0 ); |
| | 79 | + if( $db->numRows( $res ) > 0 ) |
| | 80 | + $db->dataSeek( $res, 0 ); |
| 82 | 81 | } |
| 83 | 82 | |
| 84 | 83 | /** |
| Index: trunk/phase3/includes/SpecialMostlinked.php |
| — | — | @@ -43,7 +43,7 @@ |
| 44 | 44 | if( $db->numRows( $res ) > 0 ) { |
| 45 | 45 | $linkBatch = new LinkBatch(); |
| 46 | 46 | while( $row = $db->fetchObject( $res ) ) |
| 47 | | - $linkBatch->addObj( Title::makeTitleSafe( $row->namespace, $row->title ) ); |
| | 47 | + $linkBatch->add( $row->namespace, $row->title ); |
| 48 | 48 | $db->dataSeek( $res, 0 ); |
| 49 | 49 | $linkBatch->execute(); |
| 50 | 50 | } |
| Index: trunk/phase3/includes/SpecialMostlinkedcategories.php |
| — | — | @@ -38,7 +38,7 @@ |
| 39 | 39 | function preprocessResults( $db, $res ) { |
| 40 | 40 | $batch = new LinkBatch; |
| 41 | 41 | while ( $row = $db->fetchObject( $res ) ) |
| 42 | | - $batch->addObj( Title::makeTitleSafe( $row->namespace, $row->title ) ); |
| | 42 | + $batch->add( $row->namespace, $row->title ); |
| 43 | 43 | $batch->execute(); |
| 44 | 44 | |
| 45 | 45 | // Back to start for display |
| Index: trunk/phase3/includes/SpecialShortpages.php |
| — | — | @@ -12,7 +12,7 @@ |
| 13 | 13 | class ShortPagesPage extends QueryPage { |
| 14 | 14 | |
| 15 | 15 | function getName() { |
| 16 | | - return "Shortpages"; |
| | 16 | + return 'Shortpages'; |
| 17 | 17 | } |
| 18 | 18 | |
| 19 | 19 | /** |
| — | — | @@ -47,7 +47,7 @@ |
| 48 | 48 | if( $this->isCached() ) { |
| 49 | 49 | $batch = new LinkBatch(); |
| 50 | 50 | while( $row = $db->fetchObject( $res ) ) |
| 51 | | - $batch->addObj( Title::makeTitleSafe( $row->namespace, $row->title ) ); |
| | 51 | + $batch->add( $row->namespace, $row->title ); |
| 52 | 52 | $batch->execute(); |
| 53 | 53 | if( $db->numRows( $res ) > 0 ) |
| 54 | 54 | $db->dataSeek( $res, 0 ); |
| Index: trunk/phase3/includes/SpecialWantedcategories.php |
| — | — | @@ -10,10 +10,18 @@ |
| 11 | 11 | */ |
| 12 | 12 | class WantedCategoriesPage extends QueryPage { |
| 13 | 13 | |
| 14 | | - function getName() { return 'Wantedcategories'; } |
| 15 | | - function isExpensive() { return true; } |
| 16 | | - function isSyndicated() { return false; } |
| | 14 | + function getName() { |
| | 15 | + return 'Wantedcategories'; |
| | 16 | + } |
| 17 | 17 | |
| | 18 | + function isExpensive() { |
| | 19 | + return true; |
| | 20 | + } |
| | 21 | + |
| | 22 | + function isSyndicated() { |
| | 23 | + return false; |
| | 24 | + } |
| | 25 | + |
| 18 | 26 | function getSQL() { |
| 19 | 27 | $dbr = wfGetDB( DB_SLAVE ); |
| 20 | 28 | list( $categorylinks, $page ) = $dbr->tableNamesN( 'categorylinks', 'page' ); |
| — | — | @@ -40,7 +48,7 @@ |
| 41 | 49 | function preprocessResults( $db, $res ) { |
| 42 | 50 | $batch = new LinkBatch; |
| 43 | 51 | while ( $row = $db->fetchObject( $res ) ) |
| 44 | | - $batch->addObj( Title::makeTitleSafe( $row->namespace, $row->title ) ); |
| | 52 | + $batch->add( $row->namespace, $row->title ); |
| 45 | 53 | $batch->execute(); |
| 46 | 54 | |
| 47 | 55 | // Back to start for display |
| Index: trunk/phase3/includes/SpecialWantedpages.php |
| — | — | @@ -54,7 +54,7 @@ |
| 55 | 55 | function preprocessResults( $db, $res ) { |
| 56 | 56 | $batch = new LinkBatch; |
| 57 | 57 | while ( $row = $db->fetchObject( $res ) ) |
| 58 | | - $batch->addObj( Title::makeTitleSafe( $row->namespace, $row->title ) ); |
| | 58 | + $batch->add( $row->namespace, $row->title ); |
| 59 | 59 | $batch->execute(); |
| 60 | 60 | |
| 61 | 61 | // Back to start for display |