Permalink
Browse files

Output comment block cleanup and revert logical operator standard.

  • Loading branch information...
1 parent 2e77527 commit c635249629988c52290f20ea7265e9ff126ead8e @garthkerr garthkerr committed Apr 27, 2012
Showing with 11 additions and 12 deletions.
  1. +11 −12 system/core/Output.php
View
@@ -44,49 +44,49 @@ class CI_Output {
* @var string
*/
public $final_output;
-
+
/**
* Cache expiration time
*
* @var int
*/
public $cache_expiration = 0;
-
+
/**
* List of server headers
*
* @var array
*/
public $headers = array();
-
+
/**
* List of mime types
*
* @var array
*/
public $mime_types = array();
-
+
/**
* Determines wether profiler is enabled
*
* @var book
*/
public $enable_profiler = FALSE;
-
+
/**
* Determines if output compression is enabled
*
* @var bool
*/
protected $_zlib_oc = FALSE;
-
+
/**
* List of profiler sections
*
* @var array
*/
protected $_profiler_sections = array();
-
+
/**
* Whether or not to parse variables like {elapsed_time} and {memory_usage}
*
@@ -181,9 +181,8 @@ public function append_output($output)
* For an individual header, the value is returned. For an array
* of headers, a key-value array is returned.
*
- * @access public
* @param string
- * @return array|bool
+ * @return array
*/
public function get_header($header = NULL)
{
@@ -213,14 +212,14 @@ public function get_header($header = NULL)
$value = trim($header_array[1]);
// Add new or replace existing when specified
- if ( ! isset($headers[$field]) OR $output_header[1])
+ if ( ! isset($headers[$field]) || $output_header[1])
{
$headers[$field] = $value;
}
}
}
- if ( ! empty($headers) AND empty($header))
+ if ( ! empty($headers) && empty($header))
{
return $headers;
}
@@ -612,4 +611,4 @@ public function _display_cache(&$CFG, &$URI)
}
/* End of file Output.php */
-/* Location: ./system/core/Output.php */
+/* Location: ./system/core/Output.php */

0 comments on commit c635249

Please sign in to comment.