X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fselector.php;h=38f765617988cd03eb7e344fbd093363531effa7;hp=00b1dffbb1303eec8d6c9947743ce2fa49c8017f;hb=768cc231b262ebeaa5aec373d9b7d97cc6b6ac95;hpb=aeae1b7c61e740769f1775c707ad5339301728de diff --git a/inc/selector.php b/inc/selector.php index 00b1dffb..38f76561 100644 --- a/inc/selector.php +++ b/inc/selector.php @@ -26,7 +26,7 @@ // Try to load these includes in the given order $configAppIncludes = array( - 'class_' . FrameworkConfiguration::getInstance()->getConfigEntry('app_helper_class'), // The ApplicationHelper class + 'class_' . FrameworkConfiguration::getSelfInstance()->getConfigEntry('app_helper_class'), // The ApplicationHelper class 'debug', // Some debugging stuff 'exceptions', // The application's own exception handler 'loader', // The application's class loader @@ -38,12 +38,12 @@ $configAppIncludes = array( ); // Cache base path/file here -$basePathFile = FrameworkConfiguration::getInstance()->getConfigEntry('application_path') . FrameworkConfiguration::getInstance()->getConfigEntry('app_name'); +$basePathFile = FrameworkConfiguration::getSelfInstance()->getConfigEntry('application_path') . FrameworkConfiguration::getSelfInstance()->getConfigEntry('app_name'); // Is the directory there? if (!is_dir($basePathFile)) { // Not found. - trigger_error('Application ' . FrameworkConfiguration::getInstance()->getConfigEntry('app_name') . ' not found.'); + trigger_error('Application ' . FrameworkConfiguration::getSelfInstance()->getConfigEntry('app_name') . ' not found.'); } // END - if // Load them all (try only) @@ -63,7 +63,7 @@ foreach ($configAppIncludes as $appInc) { //* DEBUG: */ print basename(__FILE__)."[".__LINE__."]: Loading ".basename($appFqFn)." - START\n"; require($appFqFn); //* DEBUG: */ print basename(__FILE__)."[".__LINE__."]: Loading ".basename($appFqFn)." - END\n"; - } elseif (FrameworkConfiguration::getInstance()->getConfigEntry('verbose_level') > 0) { + } elseif (FrameworkConfiguration::getSelfInstance()->getConfigEntry('verbose_level') > 0) { // File is missing trigger_error(sprintf("Cannot load application script %s.php! File is missing or read-protected.", $appInc