diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-08-13 19:06:57 +0200 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-08-13 19:27:42 +0200 |
| commit | fe1d45a023b08753f4c5f1d908d54ae842277558 (patch) | |
| tree | 1e05aba728d0d6ad9b25dcd5750604db5ff4518e /system/core/Input.php | |
| parent | 99f6c8c4d71714e62a86cee5d2f7fbfa496a3c5a (diff) | |
Fixed conflicts.
Diffstat (limited to 'system/core/Input.php')
| -rw-r--r-- | system/core/Input.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Input.php b/system/core/Input.php index dc7612e64..cfbef942d 100644 --- a/system/core/Input.php +++ b/system/core/Input.php @@ -672,7 +672,7 @@ class CI_Input { */ public function is_cli_request() { - return (bool) defined('STDIN'); + return (php_sapi_name() == 'cli') or defined('STDIN'); } } |