Added assert, all arrays are empty initialized now

[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 af45aaad14fe423ed83990ee7cd624d2a051fe85..61b6f8ab42c382a369d683f6222da3a2beb0431b 100644 (file)
--- a/inc/classes/main/output/class_ConsoleOutput.php
+++ b/inc/classes/main/output/class_ConsoleOutput.php
@@ -5,7 +5,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -72,7 +72,7 @@ class ConsoleOutput extends BaseFrameworkSystem implements OutputStreamer {
        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
 
@@ -84,10 +84,11 @@ class ConsoleOutput extends BaseFrameworkSystem implements OutputStreamer {
         * Output the code
         *
         * @param       $outStream      Something we shall sent to the console
+        * @param       $stripTags      Whether HTML tags shall be stripped out
         * @return      void
         */
-       public final function output ($outStream = false) {
-               print trim($outStream) . chr(10);
+       public final function output ($outStream = false, $stripTags = false) {
+               print trim($outStream) . PHP_EOL;
        }
 }