summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorEric Barnes <eric@ericlbarnes.com>2011-03-18 18:39:58 +0100
committerEric Barnes <eric@ericlbarnes.com>2011-03-18 18:39:58 +0100
commitbb5d4f7806fec3806c9cd21623b4bc3c390fa83a (patch)
treead9925d3beaecc19a0d2686022ef5317b1eacba2 /system
parent928083406322821a35a7d8a4205620c3854772a6 (diff)
Changed scope on parse_exec_vars. Fixes #145
Diffstat (limited to 'system')
-rw-r--r--system/core/Output.php13
1 files changed, 6 insertions, 7 deletions
diff --git a/system/core/Output.php b/system/core/Output.php
index 82c821524..5ec096a47 100644
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -28,13 +28,12 @@
*/
class CI_Output {
+ public $parse_exec_vars = TRUE; // whether or not to parse variables like {elapsed_time} and {memory_usage}
protected $final_output;
protected $cache_expiration = 0;
protected $headers = array();
protected $mime_types = array();
protected $enable_profiler = FALSE;
- protected $parse_exec_vars = TRUE; // whether or not to parse variables like {elapsed_time} and {memory_usage}
-
protected $_zlib_oc = FALSE;
protected $_profiler_sections = array();
@@ -51,10 +50,10 @@ class CI_Output {
{
include APPPATH.'config/mimes'.EXT;
}
-
-
+
+
$this->mime_types = $mimes;
-
+
log_message('debug', "Output Class Initialized");
}
@@ -87,7 +86,7 @@ class CI_Output {
function set_output($output)
{
$this->final_output = $output;
-
+
return $this;
}
@@ -177,7 +176,7 @@ class CI_Output {
$header = 'Content-Type: '.$mime_type;
$this->headers[] = array($header, TRUE);
-
+
return $this;
}