diff options
author | Wes Baker <wes@wesbaker.com> | 2012-05-07 22:49:33 +0200 |
---|---|---|
committer | Wes Baker <wes@wesbaker.com> | 2012-05-07 22:49:33 +0200 |
commit | d348135ed2131e5fa41dfa0ea7254d2f6759f3e0 (patch) | |
tree | 14cfc61c47686b895acd9e49b45c559d311195cc /system/core/Output.php | |
parent | bb2c83bddbf51c42815be3de60eab24fd87ae392 (diff) | |
parent | d207c9218531afe666168c1f5f59abd1bc19a8aa (diff) |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Conflicts:
system/core/Security.php
Diffstat (limited to 'system/core/Output.php')
-rwxr-xr-x | system/core/Output.php | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/system/core/Output.php b/system/core/Output.php index 3cb40626a..513c657a6 100755 --- a/system/core/Output.php +++ b/system/core/Output.php @@ -44,49 +44,59 @@ class CI_Output { * @var string */ public $final_output; + /** * Cache expiration time * * @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 + */ public function __construct() { $this->_zlib_oc = @ini_get('zlib.output_compression'); |