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

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

diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php
index 786bee6b6b8fa45963a9708bdf4b8b2f164d8d31..fcd7dab773ce99d083c2f8a8309fdd7689a6cbb0 100644 (file)
--- a/inc/classes/main/class_BaseFrameworkSystem.php
+++ b/inc/classes/main/class_BaseFrameworkSystem.php
@@ -313,7 +313,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
                // Set configuration instance if no registry ...
                if (!$this instanceof Register) {
                        // ... because registries doesn't need to be configured
-                       $this->setConfigInstance(FrameworkConfiguration::getInstance());
+                       $this->setConfigInstance(FrameworkConfiguration::getSelfInstance());
                } // END - if
 
                // Is the startup time set? (0 cannot be true anymore)
@@ -893,7 +893,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
                ApplicationEntryPoint::app_die(sprintf("<div class=\"debug_header\">%s debug output:</div><div class=\"debug_content\">%s</div>\nLoaded includes: <div class=\"debug_include_list\">%s</div>",
                        $this->__toString(),
                        $content,
-                       ClassLoader::getInstance()->getPrintableIncludeList()
+                       ClassLoader::getSelfInstance()->getPrintableIncludeList()
                ));
        }
 
@@ -1958,7 +1958,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
                $executionTime = microtime(true) - $this->getStartupTime();
 
                // Pack it in nice braces
-               $executionTime = sprintf('[ %01.3f ] ', $executionTime);
+               $executionTime = sprintf('[ %01.5f ] ', $executionTime);
 
                // And return it
                return $executionTime;