Static method getInstance() conflicts with getInstance() in class BaseRegistry,

[core.git] / inc / classes / main / output / class_ConsoleOutput.php

diff --git a/inc/classes/main/output/class_ConsoleOutput.php b/inc/classes/main/output/class_ConsoleOutput.php
index 9c21c444d73114207513ab69b8914fe56f15a7cd..3fc2bcc01f9a73e309ae7afd4dc8ba4bb1917623 100644 (file)
--- a/inc/classes/main/output/class_ConsoleOutput.php
+++ b/inc/classes/main/output/class_ConsoleOutput.php
@@ -26,7 +26,7 @@ class ConsoleOutput extends BaseFrameworkSystem implements OutputStreamer {
        /**
         * The instance for the singleton design pattern
         */
-       private static $consoleInstance = null;
+       private static $consoleInstance = NULL;
 
        /**
         * Protected constructor
@@ -70,10 +70,13 @@ class ConsoleOutput extends BaseFrameworkSystem implements OutputStreamer {
         * @return      $consoleInstance        An instance of this class
         */
        public static final function getInstance() {
+               // Is the self-instance already set?
                if (is_null(self::$consoleInstance)) {
-                       $contentType = FrameworkConfiguration::getInstance()->getConfigEntry('web_content_type');
+                       $contentType = FrameworkConfiguration::getSelfInstance()->getConfigEntry('web_content_type');
                        self::$consoleInstance = ConsoleOutput::createConsoleOutput($contentType);
-               }
+               } // END - if
+
+               // Return the instance
                return self::$consoleInstance;
        }
 
@@ -84,7 +87,7 @@ class ConsoleOutput extends BaseFrameworkSystem implements OutputStreamer {
         * @return      void
         */
        public final function output ($outStream = false) {
-               print trim($outStream) . "\n";
+               print trim($outStream) . chr(10);
        }
 }