Fix displaying length of blob columns

vrana · Jan 31, 2013 · 15e83e9 · 15e83e9
1 parent 0448bd1
commit 15e83e9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
@@ -202,7 +202,7 @@ function selectLink($val, $field) {
 	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
@@ -1,2 +1,2 @@
 <?php
-$VERSION = "3.6.3";
+$VERSION = "3.6.4-dev";
diff --git 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