Merge "Remove < PHP 5.4 register_shutdown_function() from phpunit.php"

diff --git a/includes/db/Database.php b/includes/db/Database.php
index 564cd2e..bd1e375 100644 (file)
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -1925,7 +1925,6 @@ abstract class DatabaseBase implements IDatabase {
        /**
         * Get the name of an index in a given table.
         *
-        * @protected Don't use outside of DatabaseBase and childs
         * @param string $index
         * @return string
         */

diff --git a/includes/db/DatabaseSqlite.php b/includes/db/DatabaseSqlite.php
index bb3028d..664484b 100644 (file)
--- a/includes/db/DatabaseSqlite.php
+++ b/includes/db/DatabaseSqlite.php
@@ -429,7 +429,7 @@ class DatabaseSqlite extends Database {
         * @param string $index
         * @return string
         */
-       function indexName( $index ) {
+       protected function indexName( $index ) {
                return $index;
        }