From 591939dfc03a5948c0c0f538d20ed8f7ee0f6249 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 20 Jul 2018 22:00:16 -0400 Subject: [PATCH] Rename DBA::database_name to DBA::databaseName --- mod/admin.php | 2 +- src/Database/DBA.php | 2 +- src/Database/DBStructure.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mod/admin.php b/mod/admin.php index 3245cde0d..a6a09112e 100644 --- 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 62283b3b3..f7fc8a6ae 100644 --- 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 33e9c0d4d..2637cf99e 100644 --- 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";