Fix merge conflicts

ChangeLog

@@ -36,6 +36,7 @@ phpMyAdmin - ChangeLog
 4.0.6.0 (not yet released)
 - bug #4036 Call to undefined function mb_detect_encoding (clarify the doc)
 - bug Missing hints when changing a column's structure
+- bug #4048 Cannot select foreign value in Search
 
 4.0.5.0 (2013-08-04)
 - bug #3977 Not detected configuration storage

browse_foreigners.php

@@ -90,15 +90,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($_REQUEST['rownumber'])) {
-    $element_name  = "        var element_name = field + '[multi_edit]["
+    $element_name  .= "        var element_name = field + '[multi_edit]["
         . htmlspecialchars($_REQUEST['rownumber']) . "][' + fieldmd5 + ']';\n"
         . "        var null_name = field_null + '[multi_edit]["
         . htmlspecialchars($_REQUEST['rownumber']) . "][' + fieldmd5 + ']';\n";
 } else {
-    $element_name = "var element_name = field + '[]'";
+    $element_name .= "var element_name = field + '[]'";
 }
 $error = PMA_jsFormat(
     __(

libraries/TableSearch.class.php

@@ -290,7 +290,7 @@ class PMA_TableSearch
 EOT;
             $html_output .= '' . PMA_URL_getCommon($this->_db, $this->_table)
                 . '&field=' . urlencode($column_name) . '&fieldkey='
-                . $column_index . '"';
+                . $column_index . '&fromsearch=1"';
             if ($in_zoom_search_edit) {
                 $html_output .= ' class="browse_foreign"';
             }