ObjectFactory is now a 'system class'

diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php
index 7fc55e2c15eca048a3671490fdac1b2be611ffd9..bc9b5bbfabb9049acb9b1a6c451bfb2c9457e8b5 100644 (file)
--- a/inc/classes/main/class_BaseFrameworkSystem.php
+++ b/inc/classes/main/class_BaseFrameworkSystem.php
@@ -171,6 +171,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
                "Bzip2Compressor",                              // BZIP2 compressor
                "GzipCompressor",                               // GZIP compressor
                "WebOutput",                                    // Web output sub-system
                "Bzip2Compressor",                              // BZIP2 compressor
                "GzipCompressor",                               // GZIP compressor
                "WebOutput",                                    // Web output sub-system

+               "ObjectFactory",                                // Object factory

        );
 
        /**
        );
 
        /**


@@ -296,7 +297,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
                        } // END - if
 
                        // Initialize web instance
                        } // END - if
 
                        // Initialize web instance

-                       if ((is_null($this->getWebOutputInstance())) && ($this->__toString() != "ObjectFactory")) {
+                       if (is_null($this->getWebOutputInstance())) {

                                // Call our object factory
                                $outputInstance = ObjectFactory::createObjectByConfiguredName('web_engine', array($this->getConfigInstance()->readConfig('web_content_type')));
 
                                // Call our object factory
                                $outputInstance = ObjectFactory::createObjectByConfiguredName('web_engine', array($this->getConfigInstance()->readConfig('web_content_type')));