Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

1 files changed, 5 insertions, 1 deletions

diff --git a/index.php b/index.php
index 914ba5bde..03c044415 100644
--- a/index.php
+++ b/index.php
@@ -43,7 +43,11 @@ function handleError($error)
         return;
     }
 
-    common_log(LOG_ERR, "PEAR error: " . $error->getMessage());
+    $logmsg = "PEAR error: " . $error->getMessage();
+    if(common_config('site', 'logdebug')) {
+        $logmsg .= " : ". $error->getDebugInfo();
+    }
+    common_log(LOG_ERR, $logmsg);
     $msg = sprintf(_('The database for %s isn\'t responding correctly, '.
                      'so the site won\'t work properly. '.
                      'The site admins probably know about the problem, '.