[adminer-svn] SF.net SVN: adminer:[1011] trunk/adminer/include

[<jak...@us...>]

Revision: 1011
          http://adminer.svn.sourceforge.net/adminer/?rev=1011&view=rev
Author:   jakubvrana
Date:     2009-08-25 14:17:58 +0000 (Tue, 25 Aug 2009)

Log Message:
-----------
Shorten binary strings

Modified Paths:
--------------
    trunk/adminer/include/export.inc.php
    trunk/adminer/include/functions.inc.php

Modified: trunk/adminer/include/export.inc.php
===================================================================
--- trunk/adminer/include/export.inc.php	2009-08-25 14:11:15 UTC (rev 1010)
+++ trunk/adminer/include/export.inc.php	2009-08-25 14:17:58 UTC (rev 1011)
@@ -158,5 +158,5 @@
 }
 
 $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

Modified: trunk/adminer/include/functions.inc.php
===================================================================
--- trunk/adminer/include/functions.inc.php	2009-08-25 14:11:15 UTC (rev 1010)
+++ trunk/adminer/include/functions.inc.php	2009-08-25 14:17:58 UTC (rev 1011)
@@ -254,7 +254,9 @@
 }
 
 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>" : "");
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.