fixed namespace for FiLoStacker + removed config entry which does not point to

[core.git] / framework / main / classes / class_BaseFrameworkSystem.php

diff --git a/framework/main/classes/class_BaseFrameworkSystem.php b/framework/main/classes/class_BaseFrameworkSystem.php
index 4e517861b05b67f9f8804d50ee1b476cebee22d4..69bcba9595a08def54ed08771f72260c1ec294b5 100644 (file)
--- a/framework/main/classes/class_BaseFrameworkSystem.php
+++ b/framework/main/classes/class_BaseFrameworkSystem.php
@@ -257,6 +257,11 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
         */
        private $stateInstance = NULL;
 
+       /**
+        * Registry instance (implementing Register)
+        */
+       private $registryInstance = NULL;
+
        /**
         * Thousands separator
         */
@@ -1527,6 +1532,25 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
                return $this->outputInstance;
        }
 
+       /**
+        * Setter for registry instance
+        *
+        * @param       $registryInstance               An instance of a Register class
+        * @return      void
+        */
+       protected final function setRegistryInstance (Register $registryInstance) {
+               $this->registryInstance = $registryInstance;
+       }
+
+       /**
+        * Getter for registry instance
+        *
+        * @return      $registryInstance       The debug registry instance
+        */
+       public final function getRegistryInstance () {
+               return $this->registryInstance;
+       }
+
        /**
         * Setter for command name
         *
@@ -1853,7 +1877,7 @@ Loaded includes:
                $backtrace = debug_backtrace(!DEBUG_BACKTRACE_PROVIDE_OBJECT);
 
                // Is function partialStub/__callStatic ?
-               if (($backtrace[1]['function'] == 'partialStub') || ($backtrace[1]['function'] == '__callStatic')) {
+               if (in_array($backtrace[1]['function'], array('partialStub', '__call', '__callStatic'))) {
                        // Prepend class::function:line from 3rd element
                        $message = sprintf('[%s::%s:%d]: %s',
                                $backtrace[2]['class'],