From: Jan Schneider Date: Thu, 15 Jan 2009 12:01:39 +0000 (+0100) Subject: Revert "Fix position of preg_replace() call." X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=24ac34518a36a8f0b56a9c286979b93928cf3367;p=horde.git Revert "Fix position of preg_replace() call." This reverts commit 7cda93861ba418013ae076b3cd6648412d99bfaf. --- diff --git a/framework/Autoloader/lib/Horde/Autoloader.php b/framework/Autoloader/lib/Horde/Autoloader.php index 398c4f314..539d523f2 100644 --- a/framework/Autoloader/lib/Horde/Autoloader.php +++ b/framework/Autoloader/lib/Horde/Autoloader.php @@ -40,8 +40,11 @@ class Horde_Autoloader list($pattern, $replace) = $classPattern; $file = $class; - if (!is_null($replace) || preg_match($pattern, $file)) { + if (!is_null($replace)) { $file = preg_replace($pattern, $replace, $file); + } + + if (!is_null($replace) || preg_match($pattern, $file)) { $file = str_replace(array('::', '_'), '/', $file) . '.php'; $oldErrorReporting = error_reporting(E_ALL ^ E_WARNING); /* @TODO H4: Change back to include */