Merge branch 'QA_4_6-security' into master-security

libraries/Error.php

@@ -117,12 +117,17 @@ class Error extends Message
     {
         $result = array();
 
-        $members = array('file', 'line', 'function', 'class', 'type');
+        $members = array('line', 'function', 'class', 'type');
 
         foreach ($backtrace as $idx => $step) {
             /* Create new backtrace entry */
             $result[$idx] = array();
 
+            /* Make path relative */
+            if (isset($step['file'])) {
+                $result[$idx]['file'] = Error::relPath($step['file']);
+            }
+
             /* Store members we want */
             foreach ($members as $name) {
                 if (isset($step[$name])) {

libraries/core.lib.php

@@ -511,11 +511,6 @@ function PMA_sendHeaderLocation($uri, $use_refresh = false)
 
     session_write_close();
     if ($response->headersSent()) {
-        if (function_exists('debug_print_backtrace')) {
-            echo '<pre>';
-            debug_print_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-            echo '</pre>';
-        }
         trigger_error(
             'PMA_sendHeaderLocation called when headers are already sent!',
             E_USER_ERROR