The branch, master has been updated
       via  49a39787c3d44817c4c9056e0488d420a0e000ab (commit)
       via  9129444381fef0d9b57466219f21deae8fc95582 (commit)
       via  0c4148a68e38274e199fc9ab72d616b48b382529 (commit)
       via  31df8ebb5dd444fc40d566407d9b2a00eee8d1b9 (commit)
       via  d3b67a35a0df4969273529501788c68b4fddcc24 (commit)
       via  edf46c8022020099ac953b2e16f36f4f99687d87 (commit)
       via  e21d6073e46d41afbf0a09ba9bd38cd19f37e968 (commit)
      from  12348ee826d45dd2ae7f1c5b055f71e888395f2a (commit)


- Log -----------------------------------------------------------------
commit 49a39787c3d44817c4c9056e0488d420a0e000ab
Merge: 0c4148a68e38274e199fc9ab72d616b48b382529 
9129444381fef0d9b57466219f21deae8fc95582
Author: Michal Čihař <[email protected]>
Date:   Mon Jun 27 16:10:48 2011 +0200

    Merge remote-tracking branch 'origin/QA_3_4'

commit 0c4148a68e38274e199fc9ab72d616b48b382529
Merge: 12348ee826d45dd2ae7f1c5b055f71e888395f2a 
31df8ebb5dd444fc40d566407d9b2a00eee8d1b9
Author: Michal Čihař <[email protected]>
Date:   Mon Jun 27 16:08:55 2011 +0200

    Merge remote-tracking branch 'origin/QA_3_4'

-----------------------------------------------------------------------

Summary of changes:
 tbl_structure.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tbl_structure.php b/tbl_structure.php
index 4bb3a03..081b4b5 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -258,7 +258,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
         // for the case ENUM('&#8211;','&ldquo;')
         $type         = htmlspecialchars($type);
         if(strlen($type) > $GLOBALS['cfg']['LimitChars']) {
-            $type = '<abbr title="' . htmlspecialchars($type) . '">' . 
substr($type, 0, $GLOBALS['cfg']['LimitChars']) . '</abbr>';
+            $type = '<abbr title="' . $type . '">' . substr($type, 0, 
$GLOBALS['cfg']['LimitChars']) . '</abbr>';
         }
 
         $type_nowrap  = '';


hooks/post-receive
-- 
phpMyAdmin

------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security 
threats, fraudulent activity, and more. Splunk takes this data and makes 
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2d-c2
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git

Reply via email to