Rename DBA::database_name to DBA::databaseName

diff --git a/mod/admin.php b/mod/admin.php
index 3245cde0d7e26c2ec15e7d3f097d8599bcc210d4..a6a09112ec8925a4fd665be7a1d9a11701d03102 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -816,7 +816,7 @@ function admin_page_workerqueue(App $a)
 function admin_page_summary(App $a)
 {
        // are there MyISAM tables in the DB? If so, trigger a warning message
-       $r = q("SELECT `engine` FROM `information_schema`.`tables` WHERE `engine` = 'myisam' AND `table_schema` = '%s' LIMIT 1", dbesc(DBA::database_name()));
+       $r = q("SELECT `engine` FROM `information_schema`.`tables` WHERE `engine` = 'myisam' AND `table_schema` = '%s' LIMIT 1", dbesc(DBA::databaseName()));
        $showwarning = false;
        $warningtext = [];
        if (DBM::is_result($r)) {

diff --git a/src/Database/DBA.php b/src/Database/DBA.php
index 62283b3b360a33e472414d516ea88452029c8e93..f7fc8a6ae6c8b0ae133c1f2b5c999a82bb648789 100644 (file)
--- a/src/Database/DBA.php
+++ b/src/Database/DBA.php
@@ -183,7 +183,7 @@ class DBA
         *
         * @return string
         */
-       public static function database_name() {
+       public static function databaseName() {
                $ret = self::p("SELECT DATABASE() AS `db`");
                $data = self::inArray($ret);
                return $data[0]['db'];

diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index 33e9c0d4d3bf78fc0987ba3e78be57543d987013..2637cf99e272994fe10c02b7c19b47b12c8d7f72 100644 (file)
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -26,7 +26,7 @@ class DBStructure
         */
        public static function convertToInnoDB() {
                $r = q("SELECT `TABLE_NAME` FROM `information_schema`.`tables` WHERE `engine` = 'MyISAM' AND `table_schema` = '%s'",
-                       dbesc(DBA::database_name()));
+                       dbesc(DBA::databaseName()));
 
                if (!DBM::is_result($r)) {
                        echo L10n::t('There are no tables on MyISAM.')."\n";