More code merged from ship-simu

[mailer.git] / application / mxchange / loader.php

diff --git a/application/mxchange/loader.php b/application/mxchange/loader.php
index f8e83901d6d9fd0a0ba2ccb471ff3241060d6b7a..795c4c806c12722d4c52935d2e48f0adfcac56d9 100644 (file)
--- a/application/mxchange/loader.php
+++ b/application/mxchange/loader.php
@@ -22,17 +22,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-// Is the variable 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);