Fix displaying length of blob columns

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 8be06c233fc53e1678ddcdef30dde997a55b21b1..5d27e26b1de86c4c2fee877f34b666177733f20a 100644 (file)
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -202,7 +202,7 @@ username.form['auth[driver]'].onchange();
        function selectVal($val, $link, $field) {
                $return = ($val === null ? "<i>NULL</i>" : (ereg("char|binary", $field["type"]) && !ereg("var", $field["type"]) ? "<code>$val</code>" : $val));
                if (ereg('blob|bytea|raw|file', $field["type"]) && !is_utf8($val)) {
-                       $return = lang('%d byte(s)', strlen($val));
+                       $return = lang('%d byte(s)', strlen(html_entity_decode($val, ENT_QUOTES)));
                }
                return ($link ? "<a href='" . h($link) . "'>$return</a>" : $return);
        }

diff --git a/adminer/include/version.inc.php b/adminer/include/version.inc.php
index 19cf29ca3981dde7a14ec7afe6ff5b1101adcf91..6963c7c8c70d5e0e95fa1bef48db014624d6f631 100644 (file)
--- a/adminer/include/version.inc.php
+++ b/adminer/include/version.inc.php
@@ -1,2 +1,2 @@
 <?php
-$VERSION = "3.6.3";
+$VERSION = "3.6.4-dev";

diff --git a/changes.txt b/changes.txt
index 3564bcdd6525dc96e1e8bbc1195f0056fd8240a1..ea9e8123a26ef49220722c50bdac6a848df6e7b2 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -1,4 +1,6 @@
-Adminer 3.6.3 (released 2012-01-23):
+Adminer 3.6.4-dev:
+
+Adminer 3.6.3 (released 2013-01-23):
 Display error code in SQL query
 Allow specifying external links
 Treat Meta key same as Ctrl