From 3a2a3ddb5458020b30212d35b8f78abc8b9f272c Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Wed, 27 May 2015 03:38:57 +0200 Subject: [PATCH] Updated to latest 'core' + convertToClassName() and convertDashesToUnderscores() are now static. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- application/mailer/class_ApplicationHelper.php | 4 ++-- core | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/application/mailer/class_ApplicationHelper.php b/application/mailer/class_ApplicationHelper.php index 8d528a3cc4..8a8e090159 100644 --- a/application/mailer/class_ApplicationHelper.php +++ b/application/mailer/class_ApplicationHelper.php @@ -193,7 +193,7 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication } // END - if // ... and a new response object - $responseClass = sprintf("%sResponse", $this->convertToClassName($response)); + $responseClass = sprintf('%sResponse', self::convertToClassName($response)); $responseInstance = ObjectFactory::createObjectByName($responseClass, array($this)); // Remember response instance here @@ -212,7 +212,7 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication } // END - if // Get a controller resolver - $resolverClass = $this->convertToClassName($this->getAppShortName() . '_' . $responseType . '_controller_resolver'); + $resolverClass = self::convertToClassName($this->getAppShortName() . '_' . $responseType . '_controller_resolver'); $resolverInstance = ObjectFactory::createObjectByName($resolverClass, array($commandName, $this)); // Get a controller instance as well diff --git a/core b/core index 80d8dfb93e..1f81d21b97 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 80d8dfb93ec212ef5073d8354f30397340b52b1a +Subproject commit 1f81d21b97669832b84da3680d046eb9e4afba64 -- 2.30.2