diff options
| author | Timothy Warren <tim@timshomepage.net> | 2012-05-17 14:02:21 +0200 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2012-05-17 14:02:21 +0200 |
| commit | e8e09039b49ac5883e9e94162579841375e13c69 (patch) | |
| tree | c206119bbc5bdcd573b56609b6450b14e6c20dcb /system/core/Common.php | |
| parent | 43c216b998ccf8c8208b237e9e0d9c468c8a82e5 (diff) | |
| parent | ae31eb5e75d914fc3ab622a7ac5c23eb1e6d9f9a (diff) | |
Merge upstream
Diffstat (limited to 'system/core/Common.php')
| -rw-r--r-- | system/core/Common.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/system/core/Common.php b/system/core/Common.php index 78aa6e874..8b897776f 100644 --- a/system/core/Common.php +++ b/system/core/Common.php @@ -31,7 +31,7 @@ * Loads the base classes and executes the request. * * @package CodeIgniter - * @subpackage codeigniter + * @subpackage CodeIgniter * @category Common Functions * @author EllisLab Dev Team * @link http://codeigniter.com/user_guide/ @@ -57,7 +57,7 @@ if ( ! function_exists('is_php')) if ( ! isset($_is_php[$version])) { - $_is_php[$version] = (version_compare(PHP_VERSION, $version) < 0) ? FALSE : TRUE; + $_is_php[$version] = (version_compare(PHP_VERSION, $version) >= 0); } return $_is_php[$version]; @@ -506,7 +506,7 @@ if ( ! function_exists('_exception_handler')) $_error->show_php_error($severity, $message, $filepath, $line); } - // Should we log the error? No? We're done... + // Should we log the error? No? We're done... if (config_item('log_threshold') == 0) { return; |