The branch, master has been updated via c2a8246bc882bd6194e02aea61ff12878136c83a (commit) via 8219f7c544c8ffd2ba0df2034900a7f591af3219 (commit) from 6723a5bed5a36df583ac7e0863a2c91bac073196 (commit)

- Log ----------------------------------------------------------------- commit c2a8246bc882bd6194e02aea61ff12878136c83a Merge: 6723a5b 8219f7c Author: Marc Delisle marc@infomarc.info Date: Sat Nov 19 07:03:12 2011 -0500

Merge branch 'QA_3_4'

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

Summary of changes: ChangeLog | 2 ++ libraries/db_info.inc.php | 4 ++++ 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog index f528816..39086e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -73,6 +73,8 @@ phpMyAdmin - ChangeLog - bug #3431427 [display] Dropdown results - setting NULL does not work - patch #3428764 [edit] Inline edit on multi-server configuration - patch #3437354 [core] Notice: Array to string conversion in PHP 5.4 +- [interface] When ShowTooltipAliasTB is true, VIEW is wrongly shown as the + view name in main panel db Structure page

3.4.7.1 (2011-11-10) - [security] Fixed possible local file inclusion in XML import diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php index cb5bf4c..66c3951 100644 --- a/libraries/db_info.inc.php +++ b/libraries/db_info.inc.php @@ -50,6 +50,10 @@ function PMA_fillTooltip(&$tooltip_truename, &$tooltip_aliasname, $table) // remove InnoDB comment from end, just the minimal part (*? is non greedy) $table['Comment'] = preg_replace('@; InnoDB free:.*?$@', '', $table['Comment']); } + // views have VIEW as comment so it's not a real comment put by a user + if ('VIEW' == $table['Comment']) { + $table['Comment'] = ''; + } if (empty($table['Comment'])) { $table['Comment'] = $table['Name']; } else {

hooks/post-receive