From 9db190c7e736ec8d063187d4241b59feaf7dc2d1 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Wed, 22 Jun 2011 11:28:20 +0200
Subject: update to MediaWiki 1.17.0

---
 maintenance/updateSpecialPages.php | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'maintenance/updateSpecialPages.php')

diff --git a/maintenance/updateSpecialPages.php b/maintenance/updateSpecialPages.php
index aaad3714..3e5df982 100644
--- a/maintenance/updateSpecialPages.php
+++ b/maintenance/updateSpecialPages.php
@@ -18,10 +18,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  *
+ * @file
  * @ingroup Maintenance
  */
- 
-require_once( dirname(__FILE__) . '/Maintenance.php' );
+
+require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 
 class UpdateSpecialPages extends Maintenance {
 	public function __construct() {
@@ -36,8 +37,8 @@ class UpdateSpecialPages extends Maintenance {
 		$wgOut->disable();
 		$dbw = wfGetDB( DB_MASTER );
 
-		foreach( $wgSpecialPageCacheUpdates as $special => $call ) {
-			if( !is_callable($call) ) {
+		foreach ( $wgSpecialPageCacheUpdates as $special => $call ) {
+			if ( !is_callable( $call ) ) {
 				$this->error( "Uncallable function $call!" );
 				continue;
 			}
@@ -45,7 +46,7 @@ class UpdateSpecialPages extends Maintenance {
 			call_user_func( $call, $dbw );
 			$t2 = explode( ' ', microtime() );
 			$this->output( sprintf( '%-30s ', $special ) );
-			$elapsed = ($t2[0] - $t1[0]) + ($t2[1] - $t1[1]);
+			$elapsed = ( $t2[0] - $t1[0] ) + ( $t2[1] - $t1[1] );
 			$hours = intval( $elapsed / 3600 );
 			$minutes = intval( $elapsed % 3600 / 60 );
 			$seconds = $elapsed - $hours * 3600 - $minutes * 60;
@@ -63,16 +64,16 @@ class UpdateSpecialPages extends Maintenance {
 		// This is needed to initialise $wgQueryPages
 		require_once( "$IP/includes/QueryPage.php" );
 
-		foreach( $wgQueryPages as $page ) {
+		foreach ( $wgQueryPages as $page ) {
 			@list( $class, $special, $limit ) = $page;
 
 			# --list : just show the name of pages
-			if( $this->hasOption('list') ) {
+			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;
 			}
@@ -88,7 +89,7 @@ class UpdateSpecialPages extends Maintenance {
 			}
 			$queryPage = new $class;
 
-			if( !$this->hasOption('only') || $this->getOption('only') == $queryPage->getName() ) {
+			if ( !$this->hasOption( 'only' ) || $this->getOption( 'only' ) == $queryPage->getName() ) {
 				$this->output( sprintf( '%-30s ',  $special ) );
 				if ( $queryPage->isExpensive() ) {
 					$t1 = explode( ' ', microtime() );
@@ -100,7 +101,7 @@ class UpdateSpecialPages extends Maintenance {
 					} else {
 						$this->output( "got $num rows in " );
 
-						$elapsed = ($t2[0] - $t1[0]) + ($t2[1] - $t1[1]);
+						$elapsed = ( $t2[0] - $t1[0] ) + ( $t2[1] - $t1[1] );
 						$hours = intval( $elapsed / 3600 );
 						$minutes = intval( $elapsed % 3600 / 60 );
 						$seconds = $elapsed - $hours * 3600 - $minutes * 60;
@@ -113,7 +114,7 @@ class UpdateSpecialPages extends Maintenance {
 						$this->output( sprintf( "%.2fs\n", $seconds ) );
 					}
 					# Reopen any connections that have closed
-					if ( !wfGetLB()->pingAll())  {
+					if ( !wfGetLB()->pingAll() )  {
 						$this->output( "\n" );
 						do {
 							$this->error( "Connection failed, reconnecting in 10 seconds..." );
@@ -135,4 +136,4 @@ class UpdateSpecialPages extends Maintenance {
 }
 
 $maintClass = "UpdateSpecialPages";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );
-- 
cgit v1.2.3-54-g00ecf