Reverting changes to functions that have no business being used in CLI apps to begin with
Signed-off-by: Daniel Hunsaker <danhunsaker@gmail.com>
diff --git a/system/core/Common.php b/system/core/Common.php
index e11668d..9baf5e3 100644
--- a/system/core/Common.php
+++ b/system/core/Common.php
@@ -531,16 +531,13 @@
$server_protocol = isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : FALSE;
- if ( ! headers_sent())
+ if (strpos(php_sapi_name(), 'cgi') === 0)
{
- if (strpos(php_sapi_name(), 'cgi') === 0)
- {
- header('Status: '.$code.' '.$text, TRUE);
- }
- else
- {
- header(($server_protocol ? $server_protocol : 'HTTP/1.1').' '.$code.' '.$text, TRUE, $code);
- }
+ header('Status: '.$code.' '.$text, TRUE);
+ }
+ else
+ {
+ header(($server_protocol ? $server_protocol : 'HTTP/1.1').' '.$code.' '.$text, TRUE, $code);
}
}
}