The branch, QA_3_4 has been updated
via 8219f7c544c8ffd2ba0df2034900a7f591af3219 (commit)
from 2e92b86f92df4dc4d295e7ad7250ab4a3c29bbf2 (commit)
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
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 2432fd3..9940711 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,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 44dc3a8..4dc7eb0 100644
--- a/libraries/db_info.inc.php
+++ b/libraries/db_info.inc.php
@@ -75,6 +75,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
--
phpMyAdmin
Show replies by date