X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=index.php;h=84a992efb3731b30d9f0ddc892569195c13dcbec;hb=1536d3ef29486fc1c5387e73106b86873fdb7cf9;hp=ecbfb3eb7b1d692e46d47ba2ae50cfc9fa13a4c3;hpb=dc5135431638440108d1b60bad0222c70750020c;p=quix0rs-gnu-social.git

diff --git a/index.php b/index.php
index ecbfb3eb7b..84a992efb3 100644
--- 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));
@@ -271,7 +271,7 @@ function main()
         common_redirect(common_local_url($args['action'], $args));
     }
 
-    $args = array_merge($args, $_REQUEST);
+    $args = array_merge($args, $_REQUEST ?: []);
 
     Event::handle('ArgsInitialize', array(&$args));