From ca32f08966f1b51fcb19460f0996bb0c4048e6fe Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 3 Dec 2011 13:29:22 +0100
Subject: Update to MediaWiki 1.18.0

* also update ArchLinux skin to chagnes in MonoBook
* Use only css to hide our menu bar when printing
---
 maintenance/sqlite.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'maintenance/sqlite.php')

diff --git a/maintenance/sqlite.php b/maintenance/sqlite.php
index 13d136d8..dc8a430e 100644
--- a/maintenance/sqlite.php
+++ b/maintenance/sqlite.php
@@ -41,20 +41,19 @@ class SqliteMaintenance extends Maintenance {
 	}
 
 	public function execute() {
-		global $wgDBtype;
-
 		// Should work even if we use a non-SQLite database
 		if ( $this->hasOption( 'check-syntax' ) ) {
 			$this->checkSyntax();
+			return;
 		}
 
-		if ( $wgDBtype != 'sqlite' ) {
+		$this->db = wfGetDB( DB_MASTER );
+
+		if ( $this->db->getType() != 'sqlite' ) {
 			$this->error( "This maintenance script requires a SQLite database.\n" );
 			return;
 		}
 
-		$this->db = wfGetDB( DB_MASTER );
-
 		if ( $this->hasOption( 'vacuum' ) ) {
 			$this->vacuum();
 		}
-- 
cgit v1.2.3-54-g00ecf