From 7cda93861ba418013ae076b3cd6648412d99bfaf Mon Sep 17 00:00:00 2001 From: Jan Schneider Date: Fri, 9 Jan 2009 14:54:45 +0100 Subject: [PATCH] Fix position of preg_replace() call. AFAICS this replace could stop the preg_match() further down from working. --- framework/Autoloader/lib/Horde/Autoloader.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/framework/Autoloader/lib/Horde/Autoloader.php b/framework/Autoloader/lib/Horde/Autoloader.php index 539d523f2..398c4f314 100644 --- a/framework/Autoloader/lib/Horde/Autoloader.php +++ b/framework/Autoloader/lib/Horde/Autoloader.php @@ -40,11 +40,8 @@ class Horde_Autoloader list($pattern, $replace) = $classPattern; $file = $class; - if (!is_null($replace)) { - $file = preg_replace($pattern, $replace, $file); - } - if (!is_null($replace) || preg_match($pattern, $file)) { + $file = preg_replace($pattern, $replace, $file); $file = str_replace(array('::', '_'), '/', $file) . '.php'; $oldErrorReporting = error_reporting(E_ALL ^ E_WARNING); /* @TODO H4: Change back to include */ -- 2.11.0