Variable cfg refactured

[core.git] / inc / selector.php

diff --git a/inc/selector.php b/inc/selector.php
index 7e7dee502a316feb47ebdecce3af46a4feb6e6b5..a95bd566fc6af67420cebc90a9748b4c59b451f6 100644 (file)
--- a/inc/selector.php
+++ b/inc/selector.php
@@ -22,12 +22,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-// Get config instance
-$cfg = FrameworkConfiguration::getInstance();
-
 // Try to load these includes in the given order
 $configAppIncludes = array(
-       'class_' . $cfg->readConfig('app_helper_class'), // The ApplicationHelper class
+       'class_' . FrameworkConfiguration::getInstance()->readConfig('app_helper_class'), // The ApplicationHelper class
        'config',               // The application's own configuration
        'data',                 // Application data
        'init',                 // The application initializer
@@ -46,13 +43,13 @@ foreach ($configAppIncludes as $inc) {
        }
 
        // Generate a FQFN for the helper class
-       $fqfn = $cfg->readConfig('application_path') . $cfg->readConfig('app_name') . '/' . $inc . '.php';
+       $fqfn = FrameworkConfiguration::getInstance()->readConfig('application_path') . FrameworkConfiguration::getInstance()->readConfig('app_name') . '/' . $inc . '.php';
 
        // Does the include file exists?
        if ((file_exists($fqfn)) && (is_file($fqfn)) && (is_readable($fqfn))) {
                // Load it
                require_once($fqfn);
-       } elseif ($cfg->readConfig('verbose_level') > 0) {
+       } elseif (FrameworkConfiguration::getInstance()->readConfig('verbose_level') > 0) {
                // File is missing
                trigger_error(sprintf("Cannot load application script %s.php! File is missing or read-protected.",
                        $inc
@@ -61,7 +58,7 @@ foreach ($configAppIncludes as $inc) {
 }
 
 // Remove variables from namespace, which we don't need
-unset($cfg, $inc, $configAppIncludes, $fqfn);
+unset($inc, $configAppIncludes, $fqfn);
 
 // [EOF]
 ?>