Results are now searchable and iterateable, insertDataSet renamed to queryInsertDataS...

[shipsimu.git] / application / selector / loader.php

diff --git a/application/selector/loader.php b/application/selector/loader.php
index ace39f5aeea890c36acd349785e38028137a283e..9869069912397671d015e08b20fc733807d1f7b0 100644 (file)
--- a/application/selector/loader.php
+++ b/application/selector/loader.php
@@ -21,14 +21,11 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-// Is the application instance set?
-if (!isset($application)) {
-       // We need this!
-       ApplicationEntryPoint::app_die("[Main:] Interne Variable <strong>application</strong> nicht gefunden!");
-}
+// Get config instance
+$cfg = FrameworkConfiguration::getInstance();
 
 // Load all classes
-ClassLoader::getInstance()->loadClasses(sprintf("%s/%s/", FrameworkConfiguration::getInstance()->readConfig('application_path'), $application));
+ClassLoader::getInstance()->loadClasses(sprintf("%s/%s/", $cfg->readConfig('application_path'), $cfg->readConfig('app_name')));
 
 // Clean up the global namespace
 unset($lowerClasses);