diff options
| author | Andrey Andreev <narf@devilix.net> | 2014-04-25 12:14:48 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2014-04-25 12:14:48 +0200 |
| commit | 15f1e247193617d351868bdc9c280f64334f0d7f (patch) | |
| tree | 7b901c438612857d6abce486bcf9e86823a52970 /system/core | |
| parent | 4e35824ca5f89bdd58827360e16f151e6f5cc61b (diff) | |
| parent | d5ce50885f9eda623bb681cb77dd667c20bec4fb (diff) | |
Merge pull request #3014 from vlakoff/various
Various fixes
Diffstat (limited to 'system/core')
| -rw-r--r-- | system/core/Exceptions.php | 2 | ||||
| -rw-r--r-- | system/core/Output.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/system/core/Exceptions.php b/system/core/Exceptions.php index 5bcb7c1c5..cb4bc3cd6 100644 --- a/system/core/Exceptions.php +++ b/system/core/Exceptions.php @@ -45,7 +45,7 @@ class CI_Exceptions { public $ob_level; /** - * List if available error levels + * List of available error levels * * @var array */ 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; |