From 90608b0a257489c8da469af16a96007093dc1ffa Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 24 Mar 2009 10:01:57 +0000 Subject: [PATCH] Config entry 'web_engine' renamed to 'output_class' (naming convention, we need to document this) --- inc/classes/exceptions/main/class_FatalErrorException.php | 1 - inc/classes/main/class_BaseFrameworkSystem.php | 2 +- inc/classes/middleware/debug/class_DebugMiddleware.php | 2 +- inc/config.php | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/inc/classes/exceptions/main/class_FatalErrorException.php b/inc/classes/exceptions/main/class_FatalErrorException.php index c790d221..dc150f97 100644 --- 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 967db1af..b8f63065 100644 --- 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 fb266b6c..dec9b06f 100644 --- 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 d40149cc..2dd258af 100644 --- 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"); -- 2.30.2