The branch, master has been updated
via eeeba849c37de3932fc6ecee5958901cfbc07cb0 (commit)
from a67e233fa7b97223f23e66cf6758505b173612b5 (commit)
- Log -----------------------------------------------------------------
commit eeeba849c37de3932fc6ecee5958901cfbc07cb0
Author: Madhura Jayaratne <[email protected]>
Date: Sat Sep 10 11:28:02 2011 +0530
Fix for bug #3403165 for 3.5 branch
-----------------------------------------------------------------------
Summary of changes:
tbl_structure.php | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/tbl_structure.php b/tbl_structure.php
index c7c0c25..1577111 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -260,19 +260,21 @@ foreach ($fields as $row) {
// for the case ENUM('–','“')
$type = htmlspecialchars($type);
// in case it is too long
+ $start = 0;
if (strlen($type) > $GLOBALS['cfg']['LimitChars']) {
+ $start = 13;
$type = '<abbr title="' . $type . '">' . substr($type, 0,
$GLOBALS['cfg']['LimitChars']) . '</abbr>';
}
unset($field_charset);
- if ((substr($type, 0, 4) == 'char'
- || substr($type, 0, 7) == 'varchar'
- || substr($type, 0, 4) == 'text'
- || substr($type, 0, 8) == 'tinytext'
- || substr($type, 0, 10) == 'mediumtext'
- || substr($type, 0, 8) == 'longtext'
- || substr($type, 0, 3) == 'set'
- || substr($type, 0, 4) == 'enum')
+ if ((substr($type, $start, 4) == 'char'
+ || substr($type, $start, 7) == 'varchar'
+ || substr($type, $start, 4) == 'text'
+ || substr($type, $start, 8) == 'tinytext'
+ || substr($type, $start, 10) == 'mediumtext'
+ || substr($type, $start, 8) == 'longtext'
+ || substr($type, $start, 3) == 'set'
+ || substr($type, $start, 4) == 'enum')
&& !$extracted_fieldspec['binary']
) {
if (strpos($type, ' character set ')) {
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
Malware Security Report: Protecting Your Business, Customers, and the
Bottom Line. Protect your business and customers by understanding the
threat from malware and how it can impact your online business.
http://www.accelacomm.com/jaw/sfnl/114/51427462/
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
