diff options
author | Timothy Warren <tim@timshomepage.net> | 2012-04-26 23:58:56 +0200 |
---|---|---|
committer | Timothy Warren <tim@timshomepage.net> | 2012-04-26 23:58:56 +0200 |
commit | 042766bac61958a21ba5d6b3c53b0e4296fdcce7 (patch) | |
tree | df9e26699ddb5d3841a0d1cc1795913c819bf611 /system/core/Output.php | |
parent | 0688ac9ad88a03f1c56cfcd9e3c475b83301344d (diff) | |
parent | 61318a2c53c13a314f483fcbbfd64c6e01f5242c (diff) |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into library-cleanup
Diffstat (limited to 'system/core/Output.php')
-rwxr-xr-x | system/core/Output.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/system/core/Output.php b/system/core/Output.php index 0683539c9..513c657a6 100755 --- a/system/core/Output.php +++ b/system/core/Output.php @@ -50,49 +50,49 @@ class CI_Output { * * @var int */ - public $cache_expiration = 0; + public $cache_expiration = 0; /** * List of server headers * * @var array */ - public $headers = array(); + public $headers = array(); /** * List of mime types * * @var array */ - public $mime_types = array(); + public $mime_types = array(); /** * Determines wether profiler is enabled * * @var book */ - public $enable_profiler = FALSE; + public $enable_profiler = FALSE; /** * Determines if output compression is enabled * * @var bool */ - protected $_zlib_oc = FALSE; + protected $_zlib_oc = FALSE; /** * List of profiler sections * * @var array */ - protected $_profiler_sections = array(); + protected $_profiler_sections = array(); /** * Whether or not to parse variables like {elapsed_time} and {memory_usage} * * @var bool */ - public $parse_exec_vars = TRUE; + public $parse_exec_vars = TRUE; /** * Set up Output class |