Sync with 5.0

2015-06-15 22:22:23 +01:00
parent 15d6f3fe15
commit 7e303014b6
6 changed files with 10 additions and 6 deletions
--- a/server.php
+++ b/server.php
@@ -14,7 +14,7 @@ $uri = urldecode(
 // This file allows us to emulate Apache's "mod_rewrite" functionality from the
 // built-in PHP web server. This provides a convenient way to test a Laravel
 // application without having installed a "real" web server software here.
-if ($uri !== '/' and file_exists(__DIR__.'/public'.$uri)) {
+if ($uri !== '/' && file_exists(__DIR__.'/public'.$uri)) {
    return false;
 }