From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Mon, 6 Jan 2014 18:31:26 +0000 (+0100)
Subject: Make tableNamesWithUseIndexOrJOIN() and makeUpdateOptions() protected
X-Git-Tag: 1.31.0-rc.0~17305^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_aide%28?a=commitdiff_plain;h=1b0a0021ca95f304d596bace798c179914ef68cd;p=lhc%2Fweb%2Fwiklou.git

Make tableNamesWithUseIndexOrJOIN() and makeUpdateOptions() protected

Per parents.

Change-Id: I4419e19abac84f8f4e397c4ebc9d1cf2e1f6a945
---

diff --git a/includes/db/DatabaseMssql.php b/includes/db/DatabaseMssql.php
index f15092f7ba..89370896e3 100644
--- a/includes/db/DatabaseMssql.php
+++ b/includes/db/DatabaseMssql.php
@@ -984,7 +984,7 @@ class DatabaseMssql extends DatabaseBase {
 	 * @param array $join_conds
 	 * @return string
 	 */
-	function tableNamesWithUseIndexOrJOIN( $tables, $use_index = array(), $join_conds = array() ) {
+	protected function tableNamesWithUseIndexOrJOIN( $tables, $use_index = array(), $join_conds = array() ) {
 		$ret = array();
 		$retJOIN = array();
 		$use_index_safe = is_array( $use_index ) ? $use_index : array();
diff --git a/includes/db/DatabaseSqlite.php b/includes/db/DatabaseSqlite.php
index 1ae2c72b07..6d2693f6fb 100644
--- a/includes/db/DatabaseSqlite.php
+++ b/includes/db/DatabaseSqlite.php
@@ -520,7 +520,7 @@ class DatabaseSqlite extends DatabaseBase {
 	 * @param array $options
 	 * @return string
 	 */
-	function makeUpdateOptions( $options ) {
+	protected function makeUpdateOptions( $options ) {
 		$options = self::fixIgnore( $options );
 
 		return parent::makeUpdateOptions( $options );