Merge pull request #3334 from GrahamForks/compiled

Correctly deal with the compiled file

Merge pull request #3334 from GrahamForks/compiled
Correctly deal with the compiled file
8eb96909 · Taylor Otwell · 39107a78 · 0d08fcf2 · 8eb96909
Commit 8eb96909 authored Apr 02, 2015 by Taylor Otwell
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

autoload.php bootstrap/autoload.php +5 -3

No files found.
--- a/bootstrap/autoload.php
+++ b/bootstrap/autoload.php
@@ -27,9 +27,11 @@ require __DIR__.'/../vendor/autoload.php';
 |
 */

-$compiledPath = __DIR__.'/../vendor/compiled.php';
-
-if (file_exists($compiledPath))
+if (file_exists($compiledPath = __DIR__.'/../vendor/compiled.php'))
+{
+	require $compiledPath;
+}
+elseif (file_exists($compiledPath = __DIR__.'/../storage/framework/compiled.php'))
 {
 	require $compiledPath;
 }