diff options
| author | Cash Costello <cash.costello@gmail.com> | 2012-06-02 08:58:50 -0700 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2012-06-02 08:58:50 -0700 |
| commit | b360a604c8bba93889249a74c188719f51034a26 (patch) | |
| tree | 4379c774725fcb89e1d17efb19a5ae1e36d990bd /engine/lib/elgglib.php | |
| parent | 0792a587b24f47d9e3755eaca0398d263c223aab (diff) | |
| parent | e3b0662aec78a46357843d0f88e385d488ceba4a (diff) | |
| download | elgg-b360a604c8bba93889249a74c188719f51034a26.tar.gz elgg-b360a604c8bba93889249a74c188719f51034a26.tar.bz2 | |
Merge pull request #190 from mrclay/patch-2
Patch for #4447
Diffstat (limited to 'engine/lib/elgglib.php')
| -rw-r--r-- | engine/lib/elgglib.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php index 3a9230a0a..db1464bd8 100644 --- a/engine/lib/elgglib.php +++ b/engine/lib/elgglib.php @@ -1053,12 +1053,14 @@ function _elgg_php_exception_handler($exception) { * * @return true * @access private + * @todo Replace error_log calls with elgg_log calls. */ function _elgg_php_error_handler($errno, $errmsg, $filename, $linenum, $vars) { $error = date("Y-m-d H:i:s (T)") . ": \"$errmsg\" in file $filename (line $linenum)"; switch ($errno) { case E_USER_ERROR: + case E_RECOVERABLE_ERROR: // (e.g. type hint violation) error_log("PHP ERROR: $error"); register_error("ERROR: $error"); @@ -1092,8 +1094,8 @@ function _elgg_php_error_handler($errno, $errmsg, $filename, $linenum, $vars) { * * @note No messages will be displayed unless debugging has been enabled. * - * @param str $message User message - * @param str $level NOTICE | WARNING | ERROR | DEBUG + * @param string $message User message + * @param string $level NOTICE | WARNING | ERROR | DEBUG * * @return bool * @since 1.7.0 |