Skip to content

Commit

Permalink
Merge branch 'hotfix/5445'
Browse files Browse the repository at this point in the history
  • Loading branch information
weierophinney committed Nov 11, 2013
2 parents e6c62c8 + d98a740 commit 1987a20
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions library/Zend/Loader/ModuleAutoloader.php
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,10 @@ public function autoload($class)
foreach ($this->paths as $path) {
$path = $path . $moduleClassPath;

if ($path == '.' || substr($path, 0, 2) == './' || substr($path, 0, 2) == '.\\') {
$path = realpath('.') . substr($path, 1);
}

$classLoaded = $this->loadModuleFromDir($path, $class);
if ($classLoaded) {
return $classLoaded;
Expand Down

0 comments on commit 1987a20

Please sign in to comment.