summaryrefslogtreecommitdiffstats
path: root/system/core/Output.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-04-25 12:14:48 +0200
committerAndrey Andreev <narf@devilix.net>2014-04-25 12:14:48 +0200
commit15f1e247193617d351868bdc9c280f64334f0d7f (patch)
tree7b901c438612857d6abce486bcf9e86823a52970 /system/core/Output.php
parent4e35824ca5f89bdd58827360e16f151e6f5cc61b (diff)
parentd5ce50885f9eda623bb681cb77dd667c20bec4fb (diff)
Merge pull request #3014 from vlakoff/various
Various fixes
Diffstat (limited to 'system/core/Output.php')
-rw-r--r--system/core/Output.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Output.php b/system/core/Output.php
index df9ef0778..238d223e2 100644
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -243,7 +243,7 @@ class CI_Output {
}
$header = 'Content-Type: '.$mime_type
- .(empty($charset) ? NULL : '; charset='.$charset);
+ .(empty($charset) ? '' : '; charset='.$charset);
$this->headers[] = array($header, TRUE);
return $this;