Merge branch 'fix-twitterbridge' into 'nightly'

[quix0rs-gnu-social.git] / index.php

diff --git a/index.php b/index.php
index ecbfb3eb7b1d692e46d47ba2ae50cfc9fa13a4c3..d96f2396e41e110482d2a66a52c5b3050e3604b0 100644 (file)
--- a/index.php
+++ b/index.php
@@ -93,9 +93,9 @@ function handleError($error)
             return;
         }
 
-        $logmsg = "PEAR error: " . $error->getMessage();
-        if ($error instanceof PEAR_Exception && common_config('site', 'logdebug')) {
-            $logmsg .= " : ". $error->toText();
+        $logmsg = "Exception thrown: " . _ve($error->getMessage());
+        if ($error instanceof PEAR_Exception && common_config('log', 'debugtrace')) {
+            $logmsg .= " PEAR: ". $error->toText();
         }
         // DB queries often end up with a lot of newlines; merge to a single line
         // for easier grepability...
@@ -103,7 +103,7 @@ function handleError($error)
         common_log(LOG_ERR, $logmsg);
 
         // @fixme backtrace output should be consistent with exception handling
-        if (common_config('site', 'logdebug')) {
+        if (common_config('log', 'debugtrace')) {
             $bt = $error->getTrace();
             foreach ($bt as $n => $line) {
                 common_log(LOG_ERR, formatBacktraceLine($n, $line));