summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2013-09-14 20:43:44 +0200
committerAndrey Andreev <narf@devilix.net>2013-09-14 20:43:44 +0200
commitfabaf06a119d15c030dd17d27a7ef25222abaf74 (patch)
tree91224330e6745df7d5a4692ebca20fb9d3a4cbfb
parent9c98991705432d9c179715bc7f3b4fb0c6d51b4b (diff)
parentd6f3d315e543a6c81917c1c2719748e018e43a5f (diff)
Merge pull request #2644 from vkeranov/develop
No need of these comment lines anymore
-rw-r--r--system/core/Common.php5
-rw-r--r--system/core/Log.php3
2 files changed, 3 insertions, 5 deletions
diff --git a/system/core/Common.php b/system/core/Common.php
index 286deccda..e24f8854d 100644
--- a/system/core/Common.php
+++ b/system/core/Common.php
@@ -429,7 +429,6 @@ if ( ! function_exists('log_message'))
*
* @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, $message)
@@ -588,7 +587,7 @@ if ( ! function_exists('_shutdown_handler'))
* of CodeIgniter.php. The main reason we use this is to simulate
* a complete custom exception handler.
*
- * E_STRICT is purposivly neglected because such events may have
+ * E_STRICT is purposivly neglected because such events may have
* been caught. Duplication or none? None is preferred for now.
*
* @link http://insomanic.me.uk/post/229851073/php-trick-catching-fatal-errors-e-error-with-a
@@ -753,4 +752,4 @@ if ( ! function_exists('function_usable'))
}
/* End of file Common.php */
-/* Location: ./system/core/Common.php */ \ No newline at end of file
+/* Location: ./system/core/Common.php */
diff --git a/system/core/Log.php b/system/core/Log.php
index 20bc55986..0390aba0b 100644
--- a/system/core/Log.php
+++ b/system/core/Log.php
@@ -140,7 +140,6 @@ class CI_Log {
*
* @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, $msg)
@@ -194,4 +193,4 @@ class CI_Log {
}
/* End of file Log.php */
-/* Location: ./system/core/Log.php */ \ No newline at end of file
+/* Location: ./system/core/Log.php */