Config entry 'web_engine' renamed to 'output_class' (naming convention, we need to...

diff --git a/inc/classes/exceptions/main/class_FatalErrorException.php b/inc/classes/exceptions/main/class_FatalErrorException.php
index c790d2216ac8531d5a0aef5ee9584afd5117d490..dc150f9760be02ec917f43923732789f8d49a44b 100644 (file)
--- a/inc/classes/exceptions/main/class_FatalErrorException.php
+++ b/inc/classes/exceptions/main/class_FatalErrorException.php
@@ -30,7 +30,6 @@ class FatalErrorException extends FrameworkException {
         * @return      void
         */
        public function __construct ($message, $code) {
-               die($message);
                // Call parent constructor
                parent::__construct($message, $code);
        }

diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php
index 967db1af2ceeb4eadee1e072f1805eee2f3a9611..b8f63065bd255fe25e12d19d4f098fcadf0ae31c 100644 (file)
--- a/inc/classes/main/class_BaseFrameworkSystem.php
+++ b/inc/classes/main/class_BaseFrameworkSystem.php
@@ -276,7 +276,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
                        $this->setDebugInstance(DebugMiddleware::createDebugMiddleware($this->getConfigInstance()->readConfig('debug_class')));
 
                        // Get output instance and set it
-                       $outputInstance = ObjectFactory::createObjectByConfiguredName('web_engine', array($this->getConfigInstance()->readConfig('web_content_type')));
+                       $outputInstance = ObjectFactory::createObjectByConfiguredName('output_class', array($this->getConfigInstance()->readConfig('web_content_type')));
                        $this->setWebOutputInstance($outputInstance);
 
                        // Set the compressor channel

diff --git a/inc/classes/middleware/debug/class_DebugMiddleware.php b/inc/classes/middleware/debug/class_DebugMiddleware.php
index fb266b6cf8e73dc8db982f36ac9a98bec3087d57..dec9b06f2e626dcb72f9363a74959d447d8d5296 100644 (file)
--- a/inc/classes/middleware/debug/class_DebugMiddleware.php
+++ b/inc/classes/middleware/debug/class_DebugMiddleware.php
@@ -106,7 +106,7 @@ class DebugMiddleware extends BaseMiddleware implements Registerable {
        public final function output ($outStream) {
                // Is the output stream set
                if (empty($outStream)) {
-                       // Initialization phase
+                       // @TODO Initialization phase
                        return;
                } // END - if
 

diff --git a/inc/config.php b/inc/config.php
index d40149cc3a06f46cc6105079649dccc7709a0009..2dd258af47c85edf45f9dda0c3c26a50db2b92a9 100644 (file)
--- a/inc/config.php
+++ b/inc/config.php
@@ -108,7 +108,7 @@ $cfg->setConfigEntry('email_template_type', "emails");
 $cfg->setConfigEntry('code_template_type', "code");
 
 // CFG: WEB-ENGINE
-$cfg->setConfigEntry('web_engine', "WebOutput");
+$cfg->setConfigEntry('output_class', "WebOutput");
 
 // CFG: SELECTOR-TEMPLATE-PREFIX
 $cfg->setConfigEntry('tpl_selector_prefix', "selector");