PostgreSQL: Fix displaying NULL bytea fields

diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php
index eaa2865dcb3db42bd931df2fa510fd168124dd25..add56272e5a542ef8d63a5423337625e32e6953c 100644 (file)
--- a/adminer/drivers/pgsql.inc.php
+++ b/adminer/drivers/pgsql.inc.php
@@ -40,7 +40,7 @@ if (isset($_GET["pgsql"])) {
                        }
 
                        function value($val, $field) {
-                               return ($field["type"] == "bytea" ? pg_unescape_bytea($val) : $val);
+                               return ($field["type"] == "bytea" && $val !== null ? pg_unescape_bytea($val) : $val);
                        }
 
                        function quoteBinary($string) {

diff --git a/changes.txt b/changes.txt
index a3975510a405e6d8677e677b4a5d4c11e6882b7f..f1c43217aa88aba92c45a022449b60c742d7aa66 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -9,6 +9,7 @@ PostgreSQL: Create PRIMARY KEY for auto increment columns
 PostgreSQL: Avoid exporting empty sequence last value (bug #768)
 PostgreSQL: Do not show triggers from other schemas (PR #412)
 PostgreSQL: Fix multi-parameter functions in default values (bug #736)
+PostgreSQL: Fix displaying NULL bytea fields
 PostgreSQL PDO: Do not select NULL function for false values in edit
 Oracle: Alter indexes
 Oracle: Count tables