Static method getInstance() conflicts with getInstance() in class BaseRegistry,

[core.git] / inc / classes.php

diff --git a/inc/classes.php b/inc/classes.php
index 6be9fab0ce71529da3c62763cf4717be74cf8cbf..6084add1e799e8ab0ba2b4b8e857a35f6bd2f74e 100644 (file)
--- a/inc/classes.php
+++ b/inc/classes.php
@@ -4,8 +4,10 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0
- * @copyright  Copyright (c) 2007 - 2009 Roland Haeder, this is free software
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
+ * @deprecated
+ * @todo               We should 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
@@ -29,10 +31,13 @@ $lowerClasses = array(
        'middleware'  // The middleware
 );
 
+// Cache loader instance
+$loaderInstance = ClassLoader::getSelfInstance();
+
 // Load all classes
 foreach ($lowerClasses as $className) {
        // Try to load the framework classes
-       ClassLoader::getInstance()->scanClassPath('inc/classes/' . $className . '/');
+       $loaderInstance->scanClassPath('inc/classes/' . $className . '/');
 } // END - foreach
 
 // Clean up the global namespace