From ba6827677a1546937a45beaf32191f3c3d055b06 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Tue, 24 Mar 2015 18:36:13 +0100 Subject: [PATCH] getResponseTypeFromSystem() is now static. Output system is now no longer initialized by loading a centralized inc/output.php as this was a stupid idea and sometimes the same application has a console and web part. Signed-off-by: Roland Haeder --- application/lfdb2/class_ApplicationHelper.php | 4 ++-- application/lfdb2/init.php | 2 +- core | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/application/lfdb2/class_ApplicationHelper.php b/application/lfdb2/class_ApplicationHelper.php index 351672f..5d07e28 100644 --- a/application/lfdb2/class_ApplicationHelper.php +++ b/application/lfdb2/class_ApplicationHelper.php @@ -159,8 +159,8 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica } // END - if // Default response is console - $response = $this->getResponseTypeFromSystem(); - $responseType = $this->getResponseTypeFromSystem(); + $response = self::getResponseTypeFromSystem(); + $responseType = self::getResponseTypeFromSystem(); // Create a new request object $requestInstance = ObjectFactory::createObjectByName($this->convertToClassName($response) . 'Request'); diff --git a/application/lfdb2/init.php b/application/lfdb2/init.php index f663344..7f4120e 100644 --- a/application/lfdb2/init.php +++ b/application/lfdb2/init.php @@ -28,7 +28,7 @@ $cfg = FrameworkConfiguration::getSelfInstance(); // Initialize output system -require($cfg->getConfigEntry('base_path') . 'inc/output.php'); +ApplicationHelper::createDebugInstance('ApplicationHelper'); // This application needs a database connection then we have to simply include // the inc/database.php script diff --git a/core b/core index 87b2be5..a142fe5 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 87b2be57b63b6e923aab40e0fbba2ff86db88a86 +Subproject commit a142fe5eeaaa17a434c80ea103088558157c43bb -- 2.39.5