Merge branch 'QA_4_4'

phpmyadmin · Aug 8, 2015 · b2176f4 · b2176f4
2 parents 23aecf5 + 94a3c36
commit b2176f4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -89,6 +89,7 @@ phpMyAdmin - ChangeLog
 - issue #10250 Displayed git revision info is not set
 
 4.4.14.0 (not yet released)
+- issue #11367 Export after search, missing WHERE clause
 
 4.4.13.1 (2015-08-08)
 - issue #11368 SQL error when importing phpMyAdmin dump file

diff --git a/tbl_row_action.php b/tbl_row_action.php
@@ -61,6 +61,15 @@
 }
 
 if (!empty($submit_mult)) {
+
+    if (! isset($_REQUEST['rows_to_delete'])
+        || ! is_array($_REQUEST['rows_to_delete'])
+    ) {
+        $response = PMA_Response::getInstance();
+        $response->isSuccess(false);
+        $response->addJSON('message', __('No row selected.'));
+    }
+
     switch($submit_mult) {
     case 'row_copy':
         $_REQUEST['default_action'] = 'insert';