| Index: trunk/phase3/maintenance/updateSpecialPages.php |
| — | — | @@ -93,7 +93,7 @@ |
| 94 | 94 | $queryPage = new $class; |
| 95 | 95 | } |
| 96 | 96 | |
| 97 | | - if ( !$this->hasOption( 'only' ) || $this->getOption( 'only' ) == $queryPage->name() ) { |
| | 97 | + if ( !$this->hasOption( 'only' ) || $this->getOption( 'only' ) == $queryPage->getName() ) { |
| 98 | 98 | $this->output( sprintf( '%-30s ', $special ) ); |
| 99 | 99 | if ( $queryPage->isExpensive() ) { |
| 100 | 100 | $t1 = explode( ' ', microtime() ); |
| Index: trunk/phase3/includes/QueryPage.php |
| — | — | @@ -277,7 +277,7 @@ |
| 278 | 278 | |
| 279 | 279 | $fname = get_class( $this ) . '::recache'; |
| 280 | 280 | $dbw = wfGetDB( DB_MASTER ); |
| 281 | | - $dbr = wfGetDB( DB_SLAVE, array( $this->name(), __METHOD__, 'vslow' ) ); |
| | 281 | + $dbr = wfGetDB( DB_SLAVE, array( $this->getName(), __METHOD__, 'vslow' ) ); |
| 282 | 282 | if ( !$dbw || !$dbr ) { |
| 283 | 283 | return false; |
| 284 | 284 | } |
| — | — | @@ -288,7 +288,7 @@ |
| 289 | 289 | } |
| 290 | 290 | |
| 291 | 291 | # Clear out any old cached data |
| 292 | | - $dbw->delete( 'querycache', array( 'qc_type' => $this->name() ), $fname ); |
| | 292 | + $dbw->delete( 'querycache', array( 'qc_type' => $this->getName() ), $fname ); |
| 293 | 293 | # Do query |
| 294 | 294 | $res = $this->reallyDoQuery( $limit, false ); |
| 295 | 295 | $num = false; |
| — | — | @@ -308,7 +308,7 @@ |
| 309 | 309 | $value = 0; |
| 310 | 310 | } |
| 311 | 311 | |
| 312 | | - $vals[] = array( 'qc_type' => $this->name(), |
| | 312 | + $vals[] = array( 'qc_type' => $this->getName(), |
| 313 | 313 | 'qc_namespace' => $row->namespace, |
| 314 | 314 | 'qc_title' => $row->title, |
| 315 | 315 | 'qc_value' => $value ); |
| — | — | @@ -327,8 +327,8 @@ |
| 328 | 328 | } |
| 329 | 329 | |
| 330 | 330 | # Update the querycache_info record for the page |
| 331 | | - $dbw->delete( 'querycache_info', array( 'qci_type' => $this->name() ), $fname ); |
| 332 | | - $dbw->insert( 'querycache_info', array( 'qci_type' => $this->name(), 'qci_timestamp' => $dbw->timestamp() ), $fname ); |
| | 331 | + $dbw->delete( 'querycache_info', array( 'qci_type' => $this->getName() ), $fname ); |
| | 332 | + $dbw->insert( 'querycache_info', array( 'qci_type' => $this->getName(), 'qci_timestamp' => $dbw->timestamp() ), $fname ); |
| 333 | 333 | |
| 334 | 334 | } |
| 335 | 335 | return $num; |
| — | — | @@ -416,7 +416,7 @@ |
| 417 | 417 | 'qc_namespace AS namespace', |
| 418 | 418 | 'qc_title AS title', |
| 419 | 419 | 'qc_value AS value' ), |
| 420 | | - array( 'qc_type' => $this->name() ), |
| | 420 | + array( 'qc_type' => $this->getName() ), |
| 421 | 421 | __METHOD__, $options |
| 422 | 422 | ); |
| 423 | 423 | return $dbr->resultObject( $res ); |
| — | — | @@ -427,7 +427,7 @@ |
| 428 | 428 | $dbr = wfGetDB( DB_SLAVE ); |
| 429 | 429 | $fname = get_class( $this ) . '::getCachedTimestamp'; |
| 430 | 430 | $this->cachedTimestamp = $dbr->selectField( 'querycache_info', 'qci_timestamp', |
| 431 | | - array( 'qci_type' => $this->name() ), $fname ); |
| | 431 | + array( 'qci_type' => $this->getName() ), $fname ); |
| 432 | 432 | } |
| 433 | 433 | return $this->cachedTimestamp; |
| 434 | 434 | } |
| — | — | @@ -483,7 +483,7 @@ |
| 484 | 484 | # If updates on this page have been disabled, let the user know |
| 485 | 485 | # that the data set won't be refreshed for now |
| 486 | 486 | global $wgDisableQueryPageUpdate; |
| 487 | | - if ( is_array( $wgDisableQueryPageUpdate ) && in_array( $this->name(), $wgDisableQueryPageUpdate ) ) { |
| | 487 | + if ( is_array( $wgDisableQueryPageUpdate ) && in_array( $this->getName(), $wgDisableQueryPageUpdate ) ) { |
| 488 | 488 | $wgOut->addWikiMsg( 'querypage-no-updates' ); |
| 489 | 489 | } |
| 490 | 490 | |