summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2013-05-17 13:56:33 +0200
committerAndrey Andreev <narf@devilix.net>2013-05-17 13:56:33 +0200
commitf755cfdab966842dc2d402470efa0f35486800a9 (patch)
tree15ef43e05bddb2bdbc09668bc86b9e6c20f5529d /system/core
parente418e1e5b9b0f6726c953b6111b85adfe6043e9b (diff)
parentd0c30ab416b0f6bc7fdc9ea70f6fd5e07ac13884 (diff)
Merge pull request #2440 from vlakoff/develop
Logging functions: level parameter is not optional
Diffstat (limited to 'system/core')
-rw-r--r--system/core/Common.php8
-rw-r--r--system/core/Log.php4
2 files changed, 6 insertions, 6 deletions
diff --git a/system/core/Common.php b/system/core/Common.php
index b4f0c388e..cad340f33 100644
--- a/system/core/Common.php
+++ b/system/core/Common.php
@@ -424,12 +424,12 @@ if ( ! function_exists('log_message'))
* We use this as a simple mechanism to access the logging
* class and send messages to be logged.
*
- * @param string
- * @param string
- * @param bool
+ * @param string the error level: 'error', 'debug' or 'info'
+ * @param string the error message
+ * @param bool whether the error is a native PHP error
* @return void
*/
- function log_message($level = 'error', $message, $php_error = FALSE)
+ function log_message($level, $message, $php_error = FALSE)
{
static $_log, $_log_threshold;
diff --git a/system/core/Log.php b/system/core/Log.php
index a84d3dc22..e4d72b544 100644
--- a/system/core/Log.php
+++ b/system/core/Log.php
@@ -138,12 +138,12 @@ class CI_Log {
*
* Generally this function will be called using the global log_message() function
*
- * @param string the error level
+ * @param string the error level: 'error', 'debug' or 'info'
* @param string the error message
* @param bool whether the error is a native PHP error
* @return bool
*/
- public function write_log($level = 'error', $msg, $php_error = FALSE)
+ public function write_log($level, $msg, $php_error = FALSE)
{
if ($this->_enabled === FALSE)
{