summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2013-08-07 14:54:47 +0200
committerAndrey Andreev <narf@devilix.net>2013-08-07 14:54:47 +0200
commit2f8d2d381ef4a2fd9ea8f67a36a731aae8b14064 (patch)
tree859b63e2d6a2389ddc1622731c7e7cd8715fe316
parentc49d181403f9d6a2cc8ad2d24d5c9d145b53c005 (diff)
Add a changelog entry for PR #2590 and further optimize log_message()
CI_Log::write_log() already checks the log threshold, so there's no point in doing it in log_message() as well.
-rw-r--r--system/core/Common.php12
-rw-r--r--user_guide_src/source/changelog.rst1
2 files changed, 2 insertions, 11 deletions
diff --git a/system/core/Common.php b/system/core/Common.php
index 98a3fcb35..21e1df9c6 100644
--- a/system/core/Common.php
+++ b/system/core/Common.php
@@ -439,17 +439,7 @@ if ( ! function_exists('log_message'))
*/
function log_message($level, $message, $php_error = FALSE)
{
- static $_log, $_log_threshold;
-
- if ($_log_threshold === NULL)
- {
- $_log_threshold = config_item('log_threshold');
- }
-
- if ($_log_threshold === 0)
- {
- return;
- }
+ static $_log;
if ($_log === NULL)
{
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 8b73e7a98..4a45a71b0 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -606,6 +606,7 @@ Bug fixes for 3.0
- Fixed a bug (#2560) - :doc:`Form Helper <helpers/form_helper>` function :php:func:`form_open()` set the 'method="post"' attribute only if the passed attributes equaled an empty string.
- Fixed a bug (#2585) - :doc:`Query Builder <database/query_builder>` methods ``min()``, ``max()``, ``avg()``, ``sum()`` didn't escape field names.
- Fixed an edge case (#2583) in the :doc:`Email Library <libraries/email>` where `Suhosin <http://www.hardened-php.net/suhosin/>` blocked messages sent via ``mail()`` due to trailing newspaces in headers.
+- Fixed a bug (#2590) - :php:func:`log_message()` didn't actually cache the ``CI_Log`` class instance.
Version 2.1.4
=============