Merge "Make tableNamesWithUseIndexOrJOIN() and makeUpdateOptions() protected"

diff --git a/includes/db/DatabaseMssql.php b/includes/db/DatabaseMssql.php
index f15092f..8937089 100644 (file)
--- 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 1ae2c72..6d2693f 100644 (file)
--- 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 );