projects
/
horde.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2f6bdee
)
Revert "Fix position of preg_replace() call."
author
Jan Schneider
<jan@horde.org>
Thu, 15 Jan 2009 12:01:39 +0000
(13:01 +0100)
committer
Jan Schneider
<jan@horde.org>
Thu, 15 Jan 2009 12:03:43 +0000
(13:03 +0100)
This reverts commit
7cda93861ba418013ae076b3cd6648412d99bfaf
.
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
398c4f3
..
539d523
100644
(file)
--- 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 */