From: Tim Starling <tstarling@users.mediawiki.org>
Date: Mon, 20 Jun 2011 07:19:20 +0000 (+0000)
Subject: Fix for fatal error in r90429: you can't have a protected function in an interface.
X-Git-Tag: 1.31.0-rc.0~29405
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=5fbf1812d869f0fd01b7dc8599068c7c2545d975;p=lhc%2Fweb%2Fwiklou.git

Fix for fatal error in r90429: you can't have a protected function in an interface.
---

diff --git a/includes/db/Database.php b/includes/db/Database.php
index c1b3246edb..78d31a43bd 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -42,14 +42,6 @@ interface DatabaseType {
 	 */
 	function open( $server, $user, $password, $dbName );
 
-	/**
-	 * The DBMS-dependent part of query()
-	 *
-	 * @param  $sql String: SQL query.
-	 * @return Result object to feed to fetchObject, fetchRow, ...; or false on failure
-	 */
-	protected function doQuery( $sql );
-
 	/**
 	 * Fetch the next row from the given result object, in object form.
 	 * Fields can be retrieved with $row->fieldname, with fields acting like
@@ -684,6 +676,14 @@ abstract class DatabaseBase implements DatabaseType {
 		throw new DBConnectionError( $this, $error );
 	}
 
+	/**
+	 * The DBMS-dependent part of query()
+	 *
+	 * @param  $sql String: SQL query.
+	 * @return Result object to feed to fetchObject, fetchRow, ...; or false on failure
+	 */
+	protected abstract function doQuery( $sql );
+
 	/**
 	 * Determine whether a query writes to the DB.
 	 * Should return true if unsure.