From d7e9271b83d842289ab6e06d547f89d52e0c8446 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Tue, 24 Mar 2015 18:36:58 +0100 Subject: [PATCH 1/1] getResponseTypeFromSystem() is now static. Signed-off-by: Roland Haeder --- application/selector/class_ApplicationHelper.php | 4 ++-- application/shipsimu/class_ApplicationHelper.php | 4 ++-- core | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/application/selector/class_ApplicationHelper.php b/application/selector/class_ApplicationHelper.php index 7000c38..4f455f3 100644 --- a/application/selector/class_ApplicationHelper.php +++ b/application/selector/class_ApplicationHelper.php @@ -153,8 +153,8 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica Registry::getRegistry()->addInstance('app', $this); // 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/shipsimu/class_ApplicationHelper.php b/application/shipsimu/class_ApplicationHelper.php index 7000c38..4f455f3 100644 --- a/application/shipsimu/class_ApplicationHelper.php +++ b/application/shipsimu/class_ApplicationHelper.php @@ -153,8 +153,8 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica Registry::getRegistry()->addInstance('app', $this); // 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/core b/core index 87b2be5..a142fe5 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 87b2be57b63b6e923aab40e0fbba2ff86db88a86 +Subproject commit a142fe5eeaaa17a434c80ea103088558157c43bb -- 2.39.2