Merge pull request #1212 from franzliedke/patch-46

Fix CLI mode detection for some shared hosts.

Merge pull request #1212 from franzliedke/patch-46
Fix CLI mode detection for some shared hosts.
cfc024fe · Taylor Otwell · c397c26a · b1e4cf9d · cfc024fe · cfc024fe
Commit cfc024fe authored Jan 05, 2013 by Taylor Otwell
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

core.php laravel/core.php +1 -1

request.php laravel/request.php +1 -1

No files found.
--- a/laravel/core.php
+++ b/laravel/core.php
@@ -213,7 +213,7 @@ if (isset($environment))
 |
 */

-if (defined('STDIN'))
+if (Request::cli())
 {
 	$console = CLI\Command::options($_SERVER['argv']);


--- a/laravel/request.php
+++ b/laravel/request.php
@@ -196,7 +196,7 @@ class Request {
 	 */
 	public static function cli()
 	{
-		return defined('STDIN');
+		return defined('STDIN') || (substr(PHP_SAPI, 0, 3) == 'cgi' && getenv('TERM'));
 	}

 	/**