From 9efd36e6fc475e4d11889cd02c9afe826b956f7b Mon Sep 17 00:00:00 2001 From: Chuck Hagenbuch Date: Wed, 14 Jan 2009 11:51:32 -0500 Subject: [PATCH] Allow stacking multiple replacements for the same pattern --- framework/Autoloader/lib/Horde/Autoloader.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/framework/Autoloader/lib/Horde/Autoloader.php b/framework/Autoloader/lib/Horde/Autoloader.php index bdeababd6..539d523f2 100644 --- a/framework/Autoloader/lib/Horde/Autoloader.php +++ b/framework/Autoloader/lib/Horde/Autoloader.php @@ -18,7 +18,9 @@ class Horde_Autoloader * * @var array */ - protected static $_classPatterns = array('/^Horde_/' => 'Horde/'); + protected static $_classPatterns = array( + array('/^Horde_/', 'Horde/'), + ); /** * Autoload implementation automatically registered with @@ -34,7 +36,8 @@ class Horde_Autoloader */ public static function loadClass($class) { - foreach (self::$_classPatterns as $pattern => $replace) { + foreach (self::$_classPatterns as $classPattern) { + list($pattern, $replace) = $classPattern; $file = $class; if (!is_null($replace)) { @@ -90,7 +93,7 @@ class Horde_Autoloader */ public static function addClassPattern($pattern, $replace = null) { - self::$_classPatterns[$pattern] = rtrim($replace, '/') . '/'; + self::$_classPatterns[] = array($pattern, rtrim($replace, '/') . '/'); } } -- 2.11.0