summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
Diffstat (limited to 'system/core')
-rw-r--r--system/core/Exceptions.php2
-rw-r--r--system/core/Output.php2
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;