Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Delisle <marc@infomarc.info>2013-08-07 16:27:34 +0400
committerMarc Delisle <marc@infomarc.info>2013-08-07 16:27:34 +0400
commitc2b2c7b6e901ae9f786b5206085d62a67b54f66f (patch)
treed29b7a13379f5c566704eef83040ed9437f0abee /browse_foreigners.php
parent67dc37836307cca9e46f9fc186bfce67ce022b38 (diff)
Bug #4048 Cannot select foreign value in Search
Diffstat (limited to 'browse_foreigners.php')
-rw-r--r--browse_foreigners.php13
1 files changed, 10 insertions, 3 deletions
diff --git a/browse_foreigners.php b/browse_foreigners.php
index 9a9fdf9043..c3301192c1 100644
--- a/browse_foreigners.php
+++ b/browse_foreigners.php
@@ -95,15 +95,22 @@ if (is_array($foreignData['disp_row'])) {
}
}
-
+// When coming from Table/Zoom search
+if (isset($_REQUEST['fromsearch'])) {
+ // In table or zoom search, input fields are named "criteriaValues"
+ $element_name = " var field = 'criteriaValues';\n";
+} else {
+ // In insert/edit, input fields are named "fields"
+ $element_name = " var field = 'fields';\n";
+}
if (isset($rownumber)) {
- $element_name = " var element_name = field + '[multi_edit]["
+ $element_name .= " var element_name = field + '[multi_edit]["
. htmlspecialchars($rownumber) . "][' + fieldmd5 + ']';\n"
. " var null_name = field_null + '[multi_edit]["
. htmlspecialchars($rownumber) . "][' + fieldmd5 + ']';\n";
} else {
- $element_name = "var element_name = field + '[]'";
+ $element_name .= "var element_name = field + '[]'";
}
$error = PMA_jsFormat(
__(