Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge branch 'standardautoloader_fix' of https://github.com/akrabat/zf2
Browse files Browse the repository at this point in the history
… into hotfix/gh-225

Conflicts:
	library/Zend/Loader/StandardAutoloader.php
  • Loading branch information
weierophinney committed Jul 7, 2011
10 parents ecc27a8 + 526722c + 26666c9 + c993e85 + 4e037a4 + 965637a + 64de913 + b400e6b + 9a8565e + 860c287 commit 6186985
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/StandardAutoloader.php
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,9 @@ public function autoload($class)
}
return false;
}
if ($isFallback) {
return $this->loadClass($class, self::ACT_AS_FALLBACK);
}
return false;
}

Expand Down

0 comments on commit 6186985

Please sign in to comment.