Shorten binary strings

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1011 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/adminer/include/export.inc.php b/adminer/include/export.inc.php
index 00b0b52c990a45ea0229b93aa020cf7581f5a0d7..11a98ea17e050fa1e9c9a3ea02946a861329d162 100644 (file)
--- a/adminer/include/export.inc.php
+++ b/adminer/include/export.inc.php
@@ -158,5 +158,5 @@ function dump_headers($identifier, $multi_table = false) {
 }
 
 $dump_output = "<select name='output'>" . optionlist(array('text' => lang('open'), 'file' => lang('save'))) . "</select>";
-$dump_output = "<select name='output'>" . optionlist(array('sql' => lang('SQL'), 'csv' => lang('CSV'))) . "</select>";
+$dump_format = "<select name='format'>" . optionlist(array('sql' => lang('SQL'), 'csv' => lang('CSV'))) . "</select>";
 $max_packet = 1048576; // default, minimum is 1024

diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index e8447b7589067683168e94439abcc79c07221927..9c3a9f1775585e4ac28998baec17be99e08fe23a 100644 (file)
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -254,7 +254,9 @@ function is_utf8($val) {
 }
 
 function shorten_utf8($string, $length = 80, $suffix = "") {
-       preg_match("~^((?:.|\n){0,$length})(.|\n)?~u", $string, $match); // ~s causes trash in $match[2] under some PHP versions
+       if (!preg_match("~^((?:.|\n){0,$length})(.|\n)?~u", $string, $match)) { // ~s causes trash in $match[2] under some PHP versions
+               preg_match("(^([\t\r\n -~]{0,$length})(.?))s", $string, $match);
+       }
        return h($match[1]) . $suffix . ($match[2] ? "<em>...</em>" : "");
 }