[Nodeinfo] Fix twitterimport enabled check

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

diff --git a/index.php b/index.php
index eef894effcc34d04b80ebb22c8fcffddd9bbfe00..84a992efb3731b30d9f0ddc892569195c13dcbec 100644 (file)
--- a/index.php
+++ b/index.php
@@ -94,7 +94,7 @@ function handleError($error)
         }
 
         $logmsg = "Exception thrown: " . _ve($error->getMessage());
-        if ($error instanceof PEAR_Exception && common_config('site', 'logdebug')) {
+        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
@@ -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));