Type-hints fixed, header docs fixed, exceptions deprecated

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

diff --git a/application/selector/loader.php b/application/selector/loader.php
index ace39f5aeea890c36acd349785e38028137a283e..bb5c293227b7984e67ec27ca37062783d0bcaa59 100644 (file)
--- a/application/selector/loader.php
+++ b/application/selector/loader.php
@@ -5,7 +5,7 @@
  * @version            0.0.0
  * @copyright  Copyright(c) 2007, 2008 Roland Haeder, this is free software
  * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
+ * @link               http://www.ship-simu.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,18 +21,14 @@
  * 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);
-unset($class);
 
 // [EOF]
 ?>