From a92d23008003da690b9013086cd1016c0389a7b9 Mon Sep 17 00:00:00 2001 From: David Callizaya Date: Wed, 23 Aug 2017 15:39:12 -0400 Subject: [PATCH] HOR-3771 Renamed Installer controller to InstallerModule --- workflow/engine/controllers/adminProxy.php | 2 +- workflow/engine/controllers/installer.php | 3 ++- workflow/engine/methods/setup/systemInfo.php | 2 +- workflow/public_html/sysGeneric.php | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/workflow/engine/controllers/adminProxy.php b/workflow/engine/controllers/adminProxy.php index 6c4aebb86..e1a5e54c7 100644 --- a/workflow/engine/controllers/adminProxy.php +++ b/workflow/engine/controllers/adminProxy.php @@ -1427,7 +1427,7 @@ class adminProxy extends HttpProxyController } //Database server Version (MySQL version) - $installer = new Installer(); + $installer = new InstallerModule(); $systemInfo = $installer->getSystemInfo(); try { $params['mysql'] = mysql_get_server_info(); diff --git a/workflow/engine/controllers/installer.php b/workflow/engine/controllers/installer.php index 634e28f07..aca7f0526 100644 --- a/workflow/engine/controllers/installer.php +++ b/workflow/engine/controllers/installer.php @@ -1,11 +1,12 @@ getSystemInfo(); diff --git a/workflow/public_html/sysGeneric.php b/workflow/public_html/sysGeneric.php index 36bbd3778..03bbcaef7 100644 --- a/workflow/public_html/sysGeneric.php +++ b/workflow/public_html/sysGeneric.php @@ -523,7 +523,7 @@ if (! defined( 'PATH_DATA' ) || ! file_exists( PATH_DATA )) { transactionLog(PATH_CONTROLLERS.'installer.php'); $pathFile = PATH_CONTROLLERS . 'installer.php'; require_once ($pathFile); - $controller = 'Installer'; + $controller = InstallerModule::class; // if the method name is empty set default to index method if (strpos( SYS_TARGET, '/' ) !== false) { @@ -535,7 +535,7 @@ if (! defined( 'PATH_DATA' ) || ! file_exists( PATH_DATA )) { $controllerAction = ($controllerAction != '' && $controllerAction != 'login') ? $controllerAction : 'index'; // create the installer controller and call its method - if (is_callable( Array ('Installer',$controllerAction + if (is_callable( Array (InstallerModule::class,$controllerAction ) )) { $installer = new $controller(); $installer->setHttpRequestData( $_REQUEST );