Continued rewriting:

[core.git] / inc / selector.php

diff --git a/inc/selector.php b/inc/selector.php
index 19095dc113b7934d2ff5731ac17e34819a30d8c4..7c8594f20a0156d08a2202be80afe0126fa4080c 100644 (file)
--- a/inc/selector.php
+++ b/inc/selector.php
@@ -30,10 +30,9 @@ use CoreFramework\Object\BaseFrameworkSystem;
 
 // Try to load these includes in the given order
 $configAppIncludes = array(
-       'class_' . FrameworkConfiguration::getSelfInstance()->getConfigEntry('app_helper_class'), // The ApplicationHelper class
+       'class_ApplicationHelper', // The ApplicationHelper class
        'debug',                // Some debugging stuff
        'exceptions',   // The application's own exception handler
-       'loader',               // The application's class loader
        'config',               // The application's own configuration
        'config-local', // Local configuration file (optional)
        'data',                 // Application data
@@ -82,3 +81,6 @@ unset($appInc);
 unset($configAppIncludes);
 unset($appFqFn);
 unset($basePathFile);
+
+// Scan for application's classes, exceptions and interfaces
+ClassLoader::scanApplicationClasses();