Merge pull request laravel#3302 from EliuFlorez/patch-13

taylorotwell · taylorotwell · commit 7cbe38c0a952 · 2015-03-04T09:41:28.000-06:00
Update server.php
diff --git a/server.php b/server.php
@@ -13,7 +13,7 @@
 // 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;
 }

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`// This file allows us to emulate Apache's "mod_rewrite" functionality from the`
`14`	`14`	`// built-in PHP web server. This provides a convenient way to test a Laravel`
`15`	`15`	`// application without having installed a "real" web server software here.`
`16`		`-if ($uri !== '/' and file_exists(__DIR__.'/public'.$uri))`
	`16`	`+if ($uri !== '/' && file_exists(__DIR__.'/public'.$uri))`
`17`	`17`	`{`
`18`	`18`	`return false;`
`19`	`19`	`}`