summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorSongpol Sripaoeiam <sripaoeiam@gmail.com>2012-04-02 20:25:33 +0200
committerSongpol Sripaoeiam <sripaoeiam@gmail.com>2012-04-02 20:25:33 +0200
commit99888b6847d60d58922037a361c9ff7308a161ca (patch)
treec59cb9037ed7142d0284ba26b1ef2e2ab721bc6f /system/core
parent8b2044df35165ecb4fb4bb965240df2086ec93f4 (diff)
parent38c0a72169ffbf002c7f3c7fd3b4fd41f0d75f09 (diff)
Merge branch 'develop' of github.com:obiconbig/CodeIgniter into develop
Diffstat (limited to 'system/core')
-rwxr-xr-xsystem/core/Output.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/system/core/Output.php b/system/core/Output.php
index c0de24bb9..ea39b0223 100755
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -231,7 +231,8 @@ class CI_Output {
*/
public function get_current_content_type()
{
- foreach ($this->headers as $header){
+ foreach ($this->headers as $header)
+ {
if (preg_match('/^Content-Type/', $header[0]))
{
return str_replace('Content-Type: ', '', $header[0]);