From c91a28be51bd919bfa26882a94bf28ab89cf4879 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 26 Jan 2015 17:10:44 +0530 Subject: [PATCH] bug #4729 Display original field when using "Relational display column" option and display column is empty Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + libraries/DisplayResults.class.php | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 17460940ff..5dbde3c7f6 100644 --- 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 index 7f1d7d8326..224acd7243 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -5733,7 +5733,9 @@ class PMA_DisplayResults ); } 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);