From e17decc4c2b175e1b2e3cd79f7c8b4c39c1f70f1 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 3 Feb 2015 07:52:14 -0500
Subject: Better handle log/temp directory misconfiguration

---
 program/lib/Roundcube/bootstrap.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'program/lib/Roundcube/bootstrap.php')

diff --git a/program/lib/Roundcube/bootstrap.php b/program/lib/Roundcube/bootstrap.php
index af87beb24..cc2347406 100644
--- a/program/lib/Roundcube/bootstrap.php
+++ b/program/lib/Roundcube/bootstrap.php
@@ -490,8 +490,11 @@ function rcube_autoload($classname)
  */
 function rcube_pear_error($err)
 {
-    error_log(sprintf("%s (%s): %s",
-        $err->getMessage(),
-        $err->getCode(),
-        $err->getUserinfo()), 0);
+    $msg = sprintf("ERROR: %s (%s)", $err->getMessage(), $err->getCode());
+
+    if ($info = $err->getUserinfo()) {
+        $msg .= ': ' . $info;
+    }
+
+    error_log($msg, 0);
 }
-- 
cgit v1.2.3