Don't link NULL foreign key values

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index 1a070e1ad97aab77054354bc1e9eb83d61d82f74..2f1965e4ccec7dc803619a2daca6add9b2801d3a 100644 (file)
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -370,7 +370,7 @@ if (!$columns && support("table")) {
                                                if (preg_match('~blob|bytea|raw|file~', $field["type"]) && $val != "") {
                                                        $link = ME . 'download=' . urlencode($TABLE) . '&field=' . urlencode($key) . $unique_idf;
                                                }
-                                               if (!$link) { // link related items
+                                               if (!$link && $val !== null) { // link related items
                                                        foreach ((array) $foreign_keys[$key] as $foreign_key) {
                                                                if (count($foreign_keys[$key]) == 1 || end($foreign_key["source"]) == $key) {
                                                                        $link = "";

diff --git a/changes.txt b/changes.txt
index 683cc907210d759f49e30b218208319bcde88fbd..cc4f9acbd53165c7b7475fe1e1a8e219159ade2d 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -3,6 +3,7 @@ Fix compiled version of Elasticsearch
 Don't use type=number if a SQL function is used
 Disable highlighting in textareas with long texts
 Don't autofocus SQL textarea in Firefox
+Don't link NULL foreign key values
 MongoDB: Count tables, display ObjectIds, sort, limit, offset, count rows
 Elasticsearch: Create and drop DB, drop table