Merge #16615 - Fix #16612 - Empty relation view table dropdown

Pull-request: #16615 Fixes: #16612 Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · Feb 9, 2021 · 3b49d32 · 3b49d32
2 parents 620280e + dc5843d
commit 3b49d32
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/templates/table/relation/foreign_key_row.twig b/templates/table/relation/foreign_key_row.twig
@@ -89,6 +89,8 @@
     {% set tables = [] %}
     {% if foreign_db %}
         {% set tables = get_tables(foreign_db, tbl_storage_engine) %}
+    {% else %}
+        {% set tables = get_tables(db, tbl_storage_engine) %}
     {% endif %}
     <td>
         <span class="formelement clearfloat">

diff --git a/templates/table/relation/relational_dropdown.twig b/templates/table/relation/relational_dropdown.twig
@@ -11,7 +11,7 @@
             {{ value }}
         </option>
     {% endfor %}
-    {% if foreign is not same as(false) and not seen_key %}
+    {% if foreign is not same as(false) and foreign != "" and not seen_key %}
         <option value="{{ foreign }}" selected="selected">
             {{ foreign }}
         </option>