Skip to content

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/zendframeworkgh-225

Conflicts:
	library/Zend/Loader/StandardAutoloader.php
  • Loading branch information
weierophinney committed Jul 7, 2011
2 parents fd81647 + 373f50a commit 31abaef
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions library/Zend/Loader/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 31abaef

Please sign in to comment.