projects
/
horde.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9efd36e
)
Fix position of preg_replace() call.
author
Jan Schneider
<jan@horde.org>
Fri, 9 Jan 2009 13:54:45 +0000
(14:54 +0100)
committer
Jan Schneider
<jan@horde.org>
Wed, 14 Jan 2009 18:21:12 +0000
(19:21 +0100)
AFAICS this replace could stop the preg_match() further down from working.
framework/Autoloader/lib/Horde/Autoloader.php
patch
|
blob
|
history
diff --git
a/framework/Autoloader/lib/Horde/Autoloader.php
b/framework/Autoloader/lib/Horde/Autoloader.php
index
539d523
..
398c4f3
100644
(file)
--- 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 */