From d9022f63880ce039446fba8364f68e656b7bf4cb Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 3 May 2012 13:01:35 +0200
Subject: Update to MediaWiki 1.19.0

---
 maintenance/commandLine.inc | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'maintenance/commandLine.inc')

diff --git a/maintenance/commandLine.inc b/maintenance/commandLine.inc
index f57c0b67..c7adbfbc 100644
--- a/maintenance/commandLine.inc
+++ b/maintenance/commandLine.inc
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 
 global $optionsWithArgs;
 if ( !isset( $optionsWithArgs ) ) {
@@ -37,19 +37,13 @@ class CommandLineInc extends Maintenance {
 		}
 	}
 
-	public function getDbType() {
-		global $wgUseNormalUser;
-
-		return ( isset( $wgUseNormalUser ) && $wgUseNormalUser ) ?
-			Maintenance::DB_STD : Maintenance::DB_ADMIN;
-	}
-
 	/**
 	 * No help, it would just be misleading since it misses custom options
 	 */
 	protected function maybeHelp( $force = false ) {
-		if ( !$force )
+		if ( !$force ) {
 			return;
+		}
 		parent::maybeHelp( true );
 	}
 
-- 
cgit v1.2.2