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

Fix #15230 - Column misalignment

Browse Source 
Fixes: #15230
Introduced by: 637fe6de06
This commit is contained in:
William Desportes 2019-06-24 21:17:54 +02:00
parent 8fb5763b1d
commit 180b45f225
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/classes/Display/Results.php
View File

@ -1400,6 +1400,9 @@ class Results
? ' colspan="4"'
: '';
$leftOrBoth = $GLOBALS['cfg']['RowActionLinks'] === self::POSITION_LEFT
|| $GLOBALS['cfg']['RowActionLinks'] === self::POSITION_BOTH;
// ... before the result table
if (($displayParts['edit_lnk'] == self::NO_EDIT_OR_DELETE)
&& ($displayParts['del_lnk'] == self::NO_EDIT_OR_DELETE)
@ -1408,9 +1411,7 @@ class Results
$display_params['emptypre']
= ($displayParts['edit_lnk'] != self::NO_EDIT_OR_DELETE)
&& ($displayParts['del_lnk'] != self::NO_EDIT_OR_DELETE) ? 4 : 0;
} elseif (($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_LEFT)
|| ($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_BOTH)
&& ($displayParts['text_btn'] == '1')
} elseif ($leftOrBoth && ($displayParts['text_btn'] == '1')
) {
// ... at the left column of the result table header if possible
// and required
@ -1421,8 +1422,7 @@ class Results
$button_html .= '<th class="column_action print_ignore" ' . $colspan
. '>' . $full_or_partial_text_link . '</th>';
} elseif (($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_LEFT)
|| ($GLOBALS['cfg']['RowActionLinks'] == self::POSITION_BOTH)
} elseif ($leftOrBoth
&& (($displayParts['edit_lnk'] != self::NO_EDIT_OR_DELETE)
|| ($displayParts['del_lnk'] != self::NO_EDIT_OR_DELETE))
) {