diff options
| author | Andrey Andreev <narf@devilix.net> | 2014-04-29 00:01:28 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2014-04-29 00:01:28 +0200 |
| commit | e0839c3f2aba473f5cb7e81d30ebbb4e0d4d16a5 (patch) | |
| tree | 156da1efb6508cbcf72e346cd7e95c77d07bb3b3 /system/core | |
| parent | fd6efad5ac8bd5e7d08266ec407016221cd9ce99 (diff) | |
| parent | 15f1e247193617d351868bdc9c280f64334f0d7f (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
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; |