diff --git a/db_export.php b/db_export.php
index 7208d52290..26dab8d9f3 100644
--- a/db_export.php
+++ b/db_export.php
@@ -34,17 +34,13 @@ if ($num_tables < 1) {
exit;
} // end if
-$checkall_url = 'db_export.php?'
- . PMA_generate_common_url($db)
- . '&goto=db_export.php';
-
$multi_values = '
';
-$multi_values .= '
';
$multi_values .= __('Select All');
$multi_values .= '';
$multi_values .= ' / ';
-$multi_values .= '
';
$multi_values .= __('Unselect All');
$multi_values .= '';
diff --git a/libraries/DbSearch.class.php b/libraries/DbSearch.class.php
index 798135f519..002628e887 100644
--- a/libraries/DbSearch.class.php
+++ b/libraries/DbSearch.class.php
@@ -127,20 +127,12 @@ class PMA_DbSearch
|| ! is_array($_REQUEST['criteriaTables'])
) {
unset($_REQUEST['submit_search']);
- } elseif (! isset($_REQUEST['selectall'])
- && ! isset($_REQUEST['unselectall'])
- ) {
+ } else {
$this->_criteriaTables = array_intersect(
$_REQUEST['criteriaTables'], $this->_tables_names_only
);
}
- if (isset($_REQUEST['selectall'])) {
- $this->_criteriaTables = $this->_tables_names_only;
- } elseif (isset($_REQUEST['unselectall'])) {
- $this->_criteriaTables = array();
- }
-
if (empty($_REQUEST['criteriaColumnName'])
|| ! is_string($_REQUEST['criteriaColumnName'])
) {
@@ -440,17 +432,11 @@ class PMA_DbSearch
$html_output .= '';
$html_output .= '';
// Displays 'select all' and 'unselect all' links
- $alter_select = '
'
+ $alter_select = ''
. __('Select All') . ' / ';
- $alter_select .= '
'
+ $alter_select .= ''
. __('Unselect All') . '';
$html_output .= '
| ' . $alter_select . ' |
';
// Inputbox for column name entry
diff --git a/server_export.php b/server_export.php
index e4469bad52..fe175e6faa 100644
--- a/server_export.php
+++ b/server_export.php
@@ -18,17 +18,14 @@ $scripts->addFile('export.js');
require 'libraries/server_common.inc.php';
$export_page_title = __('View dump (schema) of databases') . "\n";
-$checkall_url = 'server_export.php?'
- . PMA_generate_common_url()
- . '&goto=db_export.php';
$multi_values = '