From 382e626aef68914367ce69c5173ce34a6b347c0e Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Mon, 2 Dec 2019 14:58:51 +0800 Subject: [PATCH] UpdateDatabase/MysqlEngineCharset.php --- UpdateDatabase/MysqlEngineCharset.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/UpdateDatabase/MysqlEngineCharset.php b/UpdateDatabase/MysqlEngineCharset.php index 374e6d7b..a1791876 100644 --- a/UpdateDatabase/MysqlEngineCharset.php +++ b/UpdateDatabase/MysqlEngineCharset.php @@ -13,8 +13,14 @@ class Pman_Core_UpdateDatabase_MysqlEngineCharset { function __construct() { - - $this->loadIniFiles(); //?? shared??? + // this might get run before we have imported the database + // and hence not have any db. + try { + $this->loadIniFiles(); //?? shared??? + } catch(PDO_DataObject_Exception_InvalidConfig $e) { + echo "SKipping MysqlEngineCharse - no database yet\n"; + return; + } $dbo = DB_DataObject::factory('core_enum'); if (is_a($dbo, 'PDO_DataObject')) { -- 2.39.2