Commit 8e916a4e authored by Sebastian Kummer's avatar Sebastian Kummer

Merge pull request #64 in ZP/z-push from...

Merge pull request #64 in ZP/z-push from bugfix/ZP-720-user-level-log-won-t-writeend-if-global to develop

* commit '4c91e8b0':
  ZP-720 Write memory information and END tag also to the user log file.

(cherry picked from commit d8979595)
parent db7d11d4
......@@ -174,7 +174,7 @@ class ZLog {
* @return
*/
static public function WriteEnd() {
if (LOGLEVEL_DEBUG <= LOGLEVEL) {
if (LOGLEVEL_DEBUG <= LOGLEVEL || (LOGLEVEL_DEBUG <= LOGUSERLEVEL && self::$userLog)) {
if (version_compare(phpversion(), '5.4.0') < 0) {
$time_used = number_format(time() - $_SERVER["REQUEST_TIME"], 4);
}
......@@ -298,4 +298,4 @@ function zarafa_error_handler($errno, $errstr, $errfile, $errline, $errcontext)
error_reporting(E_ALL);
set_error_handler("zarafa_error_handler");
?>
\ No newline at end of file
?>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment