Shorten JSON values in select (bug #594)

diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index debce630f63d0d798c45936498e261200b6229cd..0dc638d82e051ebc384df94674a301bdab9e8b36 100644 (file)
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -1291,7 +1291,7 @@ function is_url($string) {
 * @return bool
 */
 function is_shortable($field) {
-       return preg_match('~char|text|lob|geometry|point|linestring|polygon|string|bytea~', $field["type"]);
+       return preg_match('~char|text|json|lob|geometry|point|linestring|polygon|string|bytea~', $field["type"]);
 }
 
 /** Get query to compute number of found rows

diff --git a/changes.txt b/changes.txt
index 85f2586039ec4414769962e141ddcf0f262e9458..0b104a649002479243ba0c84ec2c869feaa82258 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -1,3 +1,6 @@
+Adminer 4.6.2-dev:
+Shorten JSON values in select (bug #594)
+
 Adminer 4.6.1 (released 2018-02-09):
 Sticky position of table actions
 Speed up rendering of long tables (regression from 4.4.0)