bug phpmyadmin#4729 Display original field when using "Relational dis…

…play column" option and display column is empty Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
NenadGajic · Jan 26, 2015 · c91a28b · c91a28b
1 parent a8e0f35
commit c91a28b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog
 4.3.9.0 (not yet released)
 - bug #4728 Incorrect headings in routine editor
 - bug #4730 Notice while browsing tables when phpmyadmin pma database exists, but not all the tables
+- bug #4729 Display original field when using "Relational display column" option and display column is empty
 
 4.3.8.0 (2015-01-24)
 - bug       Undefined constant PMA_DRIZZLE

diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php
@@ -5733,7 +5733,9 @@ private function _getRowData(
                     );
                 } else {
 
-                    if ($relational_display == self::RELATIONAL_DISPLAY_COLUMN) {
+                    if ($relational_display == self::RELATIONAL_DISPLAY_COLUMN
+                       && ! empty($map[$meta->name][2])
+                    ) {
                         // user chose "relational display field" in the
                         // display options, so show display field in the cell
                         $result .= $default_function($dispval);