X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=application%2Fselector%2Floader.php;h=f7c2dfc8e56f4f45481abab3470bb5a04ddf0781;hb=173a20fb725d49bf6de24a4afa43001f86375683;hp=44dbb5c4bb3a822ef1281fa24b88e0fb09bab87e;hpb=2a157996efd680b87b0a84cc95b91619ea6e81d9;p=shipsimu.git

diff --git a/application/selector/loader.php b/application/selector/loader.php
index 44dbb5c..f7c2dfc 100644
--- a/application/selector/loader.php
+++ b/application/selector/loader.php
@@ -3,9 +3,9 @@
  * The application's class loader
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
- * @copyright	Copyright(c) 2007, 2008 Roland Haeder, this is free software
+ * @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
@@ -18,24 +18,17 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 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));
-
-// Include all classes
-ClassLoader::getInstance()->includeAllClasses();
+ClassLoader::getInstance()->loadClasses(sprintf("%s/%s/", $cfg->readConfig('application_path'), $cfg->readConfig('app_name')));
 
 // Clean up the global namespace
 unset($lowerClasses);
-unset($class);
 
 // [EOF]
 ?>