Merge remote-tracking branch 'origin/master'

ChangeLog

@@ -54,6 +54,7 @@ phpMyAdmin - ChangeLog
 - bug #4066 varchar field not truncated in table browse mode
 + rfe #1435 Opening database should expand it in the navigation menu
 - (performance) Removed ShowTooltip directive
+- bug #4046 Exporting huge Tables causes memory-Problems
 
 4.0.5.0 (2013-08-04)
 - bug #3977 Not detected configuration storage

export.php

@@ -10,8 +10,8 @@
  * Get the variables sent or posted to this script and a core script
  */
 if (!defined('TESTSUITE')) {
+    define('PMA_BYPASS_GET_INSTANCE', 1);
     require_once 'libraries/common.inc.php';
-
     require_once 'libraries/zip.lib.php';
     require_once 'libraries/plugin_interface.lib.php';
 

libraries/common.inc.php

@@ -731,8 +731,10 @@ if (@file_exists($_SESSION['PMA_Theme']->getLayoutFile())) {
 }
 
 if (! defined('PMA_MINIMUM_COMMON')) {
-    // get a dummy object to ensure that the class is instanciated
-    PMA_Response::getInstance();
+    if (! defined('PMA_BYPASS_GET_INSTANCE')) {
+        // get a dummy object to ensure that the class is instanciated
+        PMA_Response::getInstance();
+    }
 
     /**
      * Character set conversion.
@@ -1060,7 +1062,9 @@ if (! defined('PMA_MINIMUM_COMMON')) {
      * Inclusion of profiling scripts is needed on various
      * pages like sql, tbl_sql, db_sql, tbl_select
      */
-    $response = PMA_Response::getInstance();
+    if (! defined('PMA_BYPASS_GET_INSTANCE')) {
+        $response = PMA_Response::getInstance();
+    }
     if (isset($_SESSION['profiling'])) {
         $header   = $response->getHeader();
         $scripts  = $header->getScripts();
@@ -1079,7 +1083,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
      * There is no point in even attempting to process
      * an ajax request if there is a token mismatch
      */
-    if ($response->isAjax() && $token_mismatch) {
+    if (isset($response) && $response->isAjax() && $token_mismatch) {
         $response->isSuccess(false);
         $response->addJSON(
             'message',