Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
f3e352e33d
@ -895,9 +895,15 @@ function PMA_sortableTableHeader($title, $sort, $initial_sort_order = 'ASC')
|
||||
'db' => $_REQUEST['db'],
|
||||
);
|
||||
|
||||
$url = 'db_structure.php'.PMA_URL_getCommon($_url_params);
|
||||
$url = 'db_structure.php' . PMA_URL_getCommon($_url_params);
|
||||
// We set the position back to 0 every time they sort.
|
||||
$url .= "&pos=0&sort=$sort&sort_order=$future_sort_order";
|
||||
if (! empty($_REQUEST['tbl_type'])) {
|
||||
$url .= "&tbl_type=" . $_REQUEST['tbl_type'];
|
||||
}
|
||||
if (! empty($_REQUEST['tbl_group'])) {
|
||||
$url .= "&tbl_group=" . $_REQUEST['tbl_group'];
|
||||
}
|
||||
|
||||
return PMA_Util::linkOrButton(
|
||||
$url, $title . $order_img, $order_link_params
|
||||
|
||||
Loading…
Reference in New Issue
Block a user