Test cases working with “make tap” but not just “phpunit” right now.

[lhc/web/wiklou.git] / maintenance / updateSpecialPages.php

diff --git a/maintenance/updateSpecialPages.php b/maintenance/updateSpecialPages.php
index 298cc27..aaad371 100644 (file)
--- a/maintenance/updateSpecialPages.php
+++ b/maintenance/updateSpecialPages.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
  
-require_once( "Maintenance.php" );
+require_once( dirname(__FILE__) . '/Maintenance.php' );
 
 class UpdateSpecialPages extends Maintenance {
        public function __construct() {
@@ -32,7 +32,7 @@ class UpdateSpecialPages extends Maintenance {
        }
 
        public function execute() {
-               global $wgOut, $wgSpecialPageCacheUpdates, $wgQueryPages;
+               global $IP, $wgOut, $wgSpecialPageCacheUpdates, $wgQueryPages, $wgQueryCacheLimit, $wgDisableQueryPageUpdate;
                $wgOut->disable();
                $dbw = wfGetDB( DB_MASTER );
 
@@ -60,20 +60,23 @@ class UpdateSpecialPages extends Maintenance {
                        wfWaitForSlaves( 5 );
                }
 
+               // This is needed to initialise $wgQueryPages
+               require_once( "$IP/includes/QueryPage.php" );
+
                foreach( $wgQueryPages as $page ) {
                        @list( $class, $special, $limit ) = $page;
-       
+
                        # --list : just show the name of pages
                        if( $this->hasOption('list') ) {
                                $this->output( "$special\n" );
                                continue;
                        }
-       
-                       if ( $this->hasOption('override') && $wgDisableQueryPageUpdate && in_array( $special, $wgDisableQueryPageUpdate ) ) {
+
+                       if ( !$this->hasOption('override') && $wgDisableQueryPageUpdate && in_array( $special, $wgDisableQueryPageUpdate ) ) {
                                $this->output( sprintf( "%-30s disabled\n", $special ) );
                                continue;
                        }
-       
+
                        $specialObj = SpecialPage::getPage( $special );
                        if ( !$specialObj ) {
                                $this->output( "No such special page: $special\n" );
@@ -84,7 +87,7 @@ class UpdateSpecialPages extends Maintenance {
                                require_once( $file );
                        }
                        $queryPage = new $class;
-       
+
                        if( !$this->hasOption('only') || $this->getOption('only') == $queryPage->getName() ) {
                                $this->output( sprintf( '%-30s ',  $special ) );
                                if ( $queryPage->isExpensive() ) {
@@ -96,7 +99,7 @@ class UpdateSpecialPages extends Maintenance {
                                                $this->output( "FAILED: database error\n" );
                                        } else {
                                                $this->output( "got $num rows in " );
-       
+
                                                $elapsed = ($t2[0] - $t1[0]) + ($t2[1] - $t1[1]);
                                                $hours = intval( $elapsed / 3600 );
                                                $minutes = intval( $elapsed % 3600 / 60 );
@@ -108,21 +111,21 @@ class UpdateSpecialPages extends Maintenance {
                                                        $this->output( $minutes . 'm ' );
                                                }
                                                $this->output( sprintf( "%.2fs\n", $seconds ) );
-                               }
-                               # Reopen any connections that have closed
-                               if ( !wfGetLB()->pingAll())  {
-                                       $this->output( "\n" );
-                                       do {
-                                               $this->error( "Connection failed, reconnecting in 10 seconds..." );
-                                               sleep(10);
-                                       } while ( !wfGetLB()->pingAll() );
-                                       $this->output( "Reconnected\n\n" );
-                               } else {
-                                       # Commit the results
-                                       $dbw->immediateCommit();
-                               }
-                               # Wait for the slave to catch up
-                               wfWaitForSlaves( 5 );
+                                       }
+                                       # Reopen any connections that have closed
+                                       if ( !wfGetLB()->pingAll())  {
+                                               $this->output( "\n" );
+                                               do {
+                                                       $this->error( "Connection failed, reconnecting in 10 seconds..." );
+                                                       sleep( 10 );
+                                               } while ( !wfGetLB()->pingAll() );
+                                               $this->output( "Reconnected\n\n" );
+                                       } else {
+                                               # Commit the results
+                                               $dbw->commit();
+                                       }
+                                       # Wait for the slave to catch up
+                                       wfWaitForSlaves( 5 );
                                } else {
                                        $this->output( "cheap, skipped\n" );
                                }