Process/Php7.php

[Pman.Core] / UpdateDatabase / MysqlLinks.php

diff --git a/UpdateDatabase/MysqlLinks.php b/UpdateDatabase/MysqlLinks.php
index 5d88143..2c5541a 100644 (file)
--- a/UpdateDatabase/MysqlLinks.php
+++ b/UpdateDatabase/MysqlLinks.php
@@ -79,7 +79,7 @@ class Pman_Core_UpdateDatabase_MysqlLinks {
         $this->links = parse_ini_file(preg_replace('/\.ini$/', '.links.ini', $iniCache), true);
         
         $lcfg = &$this->links;
-        $cfg = HTML_FlexyFramework::get()->DB_DataObject;
+        $cfg = empty($ff->DB_DataObject) ? array() : $ff->DB_DataObject;
         
         if (!empty($cfg['table_alias'])) {
             $ta = $cfg['table_alias'];
@@ -134,7 +134,7 @@ class Pman_Core_UpdateDatabase_MysqlLinks {
                     FROM
                         information_schema.TABLES
                     WHERE
-                        TABLE_SCHEMA = '{$q->escape($q->database())}'
+                        TABLE_SCHEMA = DATABASE()
                         AND
                         TABLE_NAME = '{$q->escape($tbl)}'
         ");