Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

2014-11-03 23:58:57 -08:00 · 2014-11-03 23:58:57 -08:00 · 3fc5da3e08
commit 3fc5da3e08
parent ea01a45eda 15c13e613c
1 changed files with 2 additions and 0 deletions
--- a/tbl_relation.php
+++ b/tbl_relation.php
@ -64,6 +64,8 @@ if (PMA_Util::isForeignKeySupported($tbl_storage_engine)) {
 }
 if ($cfgRelation['displaywork']) {
    $disp     = PMA_getDisplayField($db, $table);
+} else {
+    $disp = '';
 }

 // will be used in the logic for internal relations and foreign keys: