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

patch #1249371, correct calculation of colspan; also $dbstats should contain 0 or 1, not the colspan

Browse Source
This commit is contained in:
Marc Delisle
2005-08-02 12:21:27 +00:00
parent a710cb1df8
commit ede5072d4b
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -9,6 +9,9 @@ $Source$
* server_privileges.php: patch #1249363, remove unneeded wordwrap(), * server_privileges.php: patch #1249363, remove unneeded wordwrap(),
table width should be limited by template if necessary, table width should be limited by template if necessary,
thanks to Sebastian Mendel - cybot_tm thanks to Sebastian Mendel - cybot_tm
* server_databases.php: patch #1249371, correct calculation of colspan,
thanks to Sebastian Mendel;
also, $dbstats should contain 0 or 1, not the colspan
2005-08-01 Michal Čihař <michal@cihar.com> 2005-08-01 Michal Čihař <michal@cihar.com>
* lang/czech: Fix bad translation (is was translated to is not :-)), * lang/czech: Fix bad translation (is was translated to is not :-)),

4
server_databases.php
View File

@@ -334,9 +334,9 @@ if (count($statistics) > 0) {
. ' </tr>' . "\n"; . ' </tr>' . "\n";
} }
if ($is_superuser || $cfg['AllowUserDropDatabase']) { if ($is_superuser || $cfg['AllowUserDropDatabase']) {
$common_url_query = PMA_generate_common_url() . '&amp;sort_by=' . $sort_by . '&amp;sort_order=' . $sort_order . '&amp;dbstats=' . (empty($dbstats) ? '10' : '3'); $common_url_query = PMA_generate_common_url() . '&amp;sort_by=' . $sort_by . '&amp;sort_order=' . $sort_order . '&amp;dbstats=' . (empty($dbstats) ? '0' : '1');
echo ' <tr>' . "\n" echo ' <tr>' . "\n"
. ' <td colspan="' . (empty($dbstats) ? '10' : '3') . '">' . "\n" . ' <td colspan="' . (!empty($dbstats) ? '10' : '3') . '">' . "\n"
. ' <img src="' . $pmaThemeImage . 'arrow_' . $text_dir . '.png" border="0" width="38" height="22" alt="' . $strWithChecked . '" />' . "\n" . ' <img src="' . $pmaThemeImage . 'arrow_' . $text_dir . '.png" border="0" width="38" height="22" alt="' . $strWithChecked . '" />' . "\n"
. ' <a href="./server_databases.php?' . $common_url_query . '&amp;checkall=1" onclick="setCheckboxes(\'dbStatsForm\', true); return false;">' . "\n" . ' <a href="./server_databases.php?' . $common_url_query . '&amp;checkall=1" onclick="setCheckboxes(\'dbStatsForm\', true); return false;">' . "\n"
. ' ' . $strCheckAll . ' ' . $strCheckAll