diff options
| author | Anton Lindqvist <anton@qvister.se> | 2012-04-25 12:08:37 +0200 |
|---|---|---|
| committer | Anton Lindqvist <anton@qvister.se> | 2012-04-25 12:08:37 +0200 |
| commit | 92f10e837d132f9866626d3f2e0a633b22329ebb (patch) | |
| tree | e3ade8c7dd46f90690455fb2dcc112d6d015c980 /system/libraries/Log.php | |
| parent | 210e664abe857ddd267a7ba8713e2318d3e59a9c (diff) | |
| parent | f8ae11598ba058ee02cc4f8c82dbab3420756aae (diff) | |
Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into develop
Conflicts:
system/libraries/Cache/Cache.php
Diffstat (limited to 'system/libraries/Log.php')
| -rw-r--r-- | system/libraries/Log.php | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/system/libraries/Log.php b/system/libraries/Log.php index 944173fdd..66f9ebff9 100644 --- a/system/libraries/Log.php +++ b/system/libraries/Log.php @@ -2,7 +2,7 @@ /** * CodeIgniter * - * An open source application development framework for PHP 5.1.6 or newer + * An open source application development framework for PHP 5.2.4 or newer * * NOTICE OF LICENSE * @@ -25,8 +25,6 @@ * @filesource */ -// ------------------------------------------------------------------------ - /** * Logging Class * @@ -43,12 +41,9 @@ class CI_Log { protected $_threshold_max = 0; protected $_threshold_array = array(); protected $_date_fmt = 'Y-m-d H:i:s'; - protected $_enabled = TRUE; - protected $_levels = array('ERROR' => 1, 'DEBUG' => 2, 'INFO' => 3, 'ALL' => 4); + protected $_enabled = TRUE; + protected $_levels = array('ERROR' => 1, 'DEBUG' => 2, 'INFO' => 3, 'ALL' => 4); - /** - * Constructor - */ public function __construct() { $config =& get_config(); @@ -98,7 +93,7 @@ class CI_Log { $level = strtoupper($level); if (( ! isset($this->_levels[$level]) OR ($this->_levels[$level] > $this->_threshold)) - AND ! isset($this->_threshold_array[$this->_levels[$level]])) + && ! isset($this->_threshold_array[$this->_levels[$level]])) { return FALSE; } @@ -125,15 +120,15 @@ class CI_Log { flock($fp, LOCK_UN); fclose($fp); - if (isset($newfile) AND $newfile === TRUE) + if (isset($newfile) && $newfile === TRUE) { @chmod($filepath, FILE_WRITE_MODE); } + return TRUE; } } -// END Log Class /* End of file Log.php */ -/* Location: ./system/libraries/Log.php */ +/* Location: ./system/libraries/Log.php */
\ No newline at end of file |