clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename DBA::database_name to DBA::databaseName

This commit is contained in:
Hypolite Petovan 2018-07-20 22:00:16 -04:00
parent abbaaf5aa5
commit 591939dfc0
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/admin.php
View File

@ -816,7 +816,7 @@ function admin_page_workerqueue(App $a)
function admin_page_summary(App $a) function admin_page_summary(App $a)
{ {
// are there MyISAM tables in the DB? If so, trigger a warning message // 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; $showwarning = false;
$warningtext = []; $warningtext = [];
if (DBM::is_result($r)) { if (DBM::is_result($r)) {

2
src/Database/DBA.php
View File

@ -183,7 +183,7 @@ class DBA
* *
* @return string * @return string
*/ */
public static function database_name() { public static function databaseName() {
$ret = self::p("SELECT DATABASE() AS `db`"); $ret = self::p("SELECT DATABASE() AS `db`");
$data = self::inArray($ret); $data = self::inArray($ret);
return $data[0]['db']; return $data[0]['db'];

2
src/Database/DBStructure.php
View File

@ -26,7 +26,7 @@ class DBStructure
*/ */
public static function convertToInnoDB() { public static function convertToInnoDB() {
$r = q("SELECT `TABLE_NAME` FROM `information_schema`.`tables` WHERE `engine` = 'MyISAM' AND `table_schema` = '%s'", $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)) { if (!DBM::is_result($r)) {
echo L10n::t('There are no tables on MyISAM.')."\n"; echo L10n::t('There are no tables on MyISAM.')."\n";