From: Kevin Israel <pleasestand@live.com>
Date: Tue, 17 Dec 2013 01:13:48 +0000 (-0500)
Subject: update.php: Fix PHP4 syntax error
X-Git-Tag: 1.31.0-rc.0~17610
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=8b074987c95b5240212cbd96c8e8a41c4cff8315;p=lhc%2Fweb%2Fwiklou.git

update.php: Fix PHP4 syntax error

PHP4 does not support method chaining, so I broke the line into
two so we can continue to show a more helpful error message in
that version of PHP, which reached EOL just about six years ago.

Also changed "Done. The job took [...]" to "Done in [...]"; "job"
has a specific meaning in MediaWiki that is irrelevant here.

Follows-up fae8daa658c1.

Change-Id: If2480aa24f18d36f33462d874b2a1dd13abb641a
---

diff --git a/maintenance/update.php b/maintenance/update.php
index e01406d07c..beed72089d 100644
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -170,8 +170,8 @@ class UpdateMediaWiki extends Maintenance {
 		}
 		$time2 = new MWTimestamp();
 
-		$this->output( "\nDone.\n" );
-		$this->output( "\nThe job took " . $time2->diff( $time1 )->format( "%i:%S" ) . ".\n" );
+		$timeDiff = $time2->diff( $time1 );
+		$this->output( "\nDone in " . $timeDiff->format( "%i:%S" ) . ".\n" );
 	}
 
 	function afterFinalSetup() {