Updated to latest core revision, a lot debug constants removed

diff --git a/application/ship-simu/class_ApplicationHelper.php b/application/ship-simu/class_ApplicationHelper.php
index e1af8620c08f25dd4b28a221c31183e4d66d18b4..53d3fc3e6e8947782c21ffd1374f109cb7c38650 100644 (file)
--- a/application/ship-simu/class_ApplicationHelper.php
+++ b/application/ship-simu/class_ApplicationHelper.php
@@ -175,6 +175,9 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
                // Create a new request object
                $requestInstance = ObjectFactory::createObjectByName('HttpRequest');
 
+               // Remember request instance here
+               $this->setRequestInstance($requestInstance);
+
                // Default response is HTTP (HTML page) and type is "Web"
                $response = "http";
                $responseType = "web";
@@ -190,8 +193,7 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
                $responseClass = sprintf("%sResponse", $this->convertToClassName($response));
                $responseInstance = ObjectFactory::createObjectByName($responseClass, array($this));
 
-               // Remember both in this application
-               $this->setRequestInstance($requestInstance);
+               // Remember response instance here
                $this->setResponseInstance($responseInstance);
 
                // Get the parameter from the request

diff --git a/index.php b/index.php
index 62f3069b32d1af25c7da5d0f3f10fc5c0a2a964e..ec9080300da8eefcb9fe4549224ff9e68c907cad 100644 (file)
--- a/index.php
+++ b/index.php
@@ -83,17 +83,16 @@ class ApplicationEntryPoint {
                // Get some instances
                $tpl = FrameworkConfiguration::getInstance()->readConfig('template_class');
                $lang = LanguageSystem::getInstance();
-               $io = FileIoHandler::getInstance();
 
                // Get response instance
                $responseInstance = ApplicationHelper::getInstance()->getResponseInstance();
 
                // Is the template engine loaded?
-               if ((class_exists($tpl)) && (is_object($lang)) && (is_object($io))) {
+               if ((class_exists($tpl)) && (is_object($lang))) {
                        // Use the template engine for putting out (nicer look) the message
                        try {
                                // Get the template instance from our object factory
-                               $templateInstance = ObjectFactory::createObjectByName($tpl, array(FrameworkConfiguration::getInstance()->readConfig('tpl_base_path'), $lang, $io));
+                               $templateInstance = ObjectFactory::createObjectByName($tpl, array(ApplicationHelper::getInstance()));
                        } catch (FrameworkException $e) {
                                die(sprintf("[Main:] Could not initialize template engine for reason: <span class=\"exception_reason\">%s</span>",
                                        $e->getMessage()