Merge pull request laravel#1212 from franzliedke/patch-46

taylorotwell · taylorotwell · commit cfc024fe6609 · 2013-01-05T13:37:31.000-08:00
Fix CLI mode detection for some shared hosts.
diff --git a/laravel/core.php b/laravel/core.php
@@ -213,7 +213,7 @@
 |
 */
 
-if (defined('STDIN'))
+if (Request::cli())
 {
 	$console = CLI\Command::options($_SERVER['argv']);
 
diff --git a/laravel/request.php b/laravel/request.php
@@ -196,7 +196,7 @@ public static function time()
 	 */
 	public static function cli()
 	{
-		return defined('STDIN');
+		return defined('STDIN') || (substr(PHP_SAPI, 0, 3) == 'cgi' && getenv('TERM'));
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@`
`213`	`213`	`\|`
`214`	`214`	`*/`
`215`	`215`
`216`		`-if (defined('STDIN'))`
	`216`	`+if (Request::cli())`
`217`	`217`	`{`
`218`	`218`	`$console = CLI\Command::options($_SERVER['argv']);`
`219`	`219`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ public static function time()`
`196`	`196`	`*/`
`197`	`197`	`public static function cli()`
`198`	`198`	`{`
`199`		`- return defined('STDIN');`
	`199`	`+ return defined('STDIN') \|\| (substr(PHP_SAPI, 0, 3) == 'cgi' && getenv('TERM'));`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`/**`