UpdateCriteria currently needs to overwrite addCriteria().

[core.git] / inc / classes.php

diff --git a/inc/classes.php b/inc/classes.php
index dac2eea0d14445d6a9dd6f830a63595889e80ab6..9debeb10c10ae61afb8a0041d3c1c6c3b38dd05d 100644 (file)
--- a/inc/classes.php
+++ b/inc/classes.php
@@ -2,12 +2,12 @@
 /**
  * Load required framework classes first
  *
- * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @deprecated
- * @todo               We should minimize these includes
+ * @todo               Minimize these includes
  *
  * 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
@@ -23,23 +23,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-// Lower framework classes
-$lowerClasses = array(
-       'exceptions', // Exceptions
-       'interfaces', // Interfaces
-       'main',       // General main classes
-       'middleware'  // The middleware
-);
-
-// Load all classes
-foreach ($lowerClasses as $className) {
-       // Try to load the framework classes
-       ClassLoader::getInstance()->scanClassPath('inc/classes/' . $className . '/');
-} // END - foreach
-
-// Clean up the global namespace
-unset($lowerClasses[3]); // Applications shall not have any middleware
-unset($className);
+// Scan for all framework classes, exceptions and interfaces
+ClassLoader::scanFrameworkClasses();
 
 ////// Until here the framework classes are loaded //////