Allow user-defined autoload function

bcosca · Sep 29, 2014 · 087f832 · 087f832
1 parent e1ba912
commit 087f832
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/lib/base.php b/lib/base.php
@@ -1606,13 +1606,9 @@ function rel($url) {
 	**/
 	protected function autoload($class) {
 		$class=$this->fixslashes(ltrim($class,'\\'));
-		$path=$this->hive['AUTOLOAD'];
-		$func=NULL;
-		if (is_array($path))
-			list($path,$func)=$path;
-		foreach ($this->split($this->hive['PLUGINS'].';'.$path) as $auto)
-			if ($func && $auto.$func($class) ||
-				is_file($file=$auto.$class.'.php') ||
+		foreach ($this->split($this->hive['PLUGINS'].';'.
+			$this->hive['AUTOLOAD']) as $auto)
+			if (is_file($file=$auto.$class.'.php') ||
 				is_file($file=$auto.strtolower($class).'.php') ||
 				is_file($file=strtolower($auto.$class).'.php'))
 				return require($file);