gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Browse Source
This commit is contained in:
Madhura Jayaratne 2014-01-02 18:28:36 +05:30
commit 698157e1ba
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog
======================
4.2.0.0 (not yet released)
+ rfe #1662 Add table comment tool tip in database structure page
+ rfe #1447 Single table for display Character Sets and Collations
+ rfe #1455 Display icons/text/both for the table row actions
+ rfe #1473 Transformation to convert Boolean value to text

3
libraries/structure.lib.php
View File

@ -52,7 +52,8 @@ function PMA_getHtmlForActionLinks($current_table, $table_is_view, $tbl_url_quer
}
$search_table .= '</a>';
$browse_table_label = '<a href="sql.php?' . $tbl_url_query . '&amp;pos=0">'
$browse_table_label = '<a href="sql.php?' . $tbl_url_query
. '&amp;pos=0" title="' . $current_table['TABLE_COMMENT'] . '">'
. $truename . '</a>';
if (!$db_is_information_schema) {

2
test/libraries/PMA_structure_test.php
View File

@ -70,6 +70,7 @@ class PMA_Structure_Test extends PHPUnit_Framework_TestCase
$current_table = array(
'TABLE_ROWS' => 3,
'TABLE_NAME' => 'name1',
'TABLE_COMMENT' => 'This is a test comment'
);
$table_is_view = false;
$tbl_url_query = 'tbl_url_query';
@ -136,6 +137,7 @@ class PMA_Structure_Test extends PHPUnit_Framework_TestCase
$current_table = array(
'TABLE_ROWS' => 0,
'TABLE_NAME' => 'name1',
'TABLE_COMMENT' => 'This is a test comment'
);
$table_is_view = false;
list(