Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin

sfobiwahn · Nov 8, 2015 · d80e139 · d80e139
2 parents f9d582b + c3720ce
commit d80e139
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -32,6 +32,7 @@ phpMyAdmin - ChangeLog
 - issue #11639 Bug with the MainBackground Color
 - issue        Profiling checkbox is missing
 - issue #11642 Properly handle session expiry after POST requests
+- issue #11648 Notice in ./export.php#214 Undefined index: quick_or_custom
 
 4.5.1.0 (2015-10-23)
 - issue        Invalid argument supplied for foreach()

diff --git a/export.php b/export.php
@@ -212,7 +212,7 @@
     $separate_files = '';
 
     // Is it a quick or custom export?
-    if ($_REQUEST['quick_or_custom'] == 'quick') {
+    if (isset($_REQUEST['quick_or_custom']) && $_REQUEST['quick_or_custom'] == 'quick') {
         $quick_export = true;
     } else {
         $quick_export = false;

diff --git a/libraries/controllers/table/TableSearchController.php b/libraries/controllers/table/TableSearchController.php
@@ -204,10 +204,7 @@ public function indexAction()
                     $GLOBALS['cfg']['DefaultTabTable'], 'table'
                 );
             }
-            // Defines the url to return to in case of error in the next sql
-            // statement
-            $params = array('db' => $this->db, 'table' => $this->table);
-            $err_url = $goto . '?' . PMA_URL_getCommon($params);
+
             // Displays the find and replace form
             $this->response->addHTML(
                 Template::get('table/search/selection_form')