patch #2356575 part 5
This commit is contained in:
@@ -149,13 +149,13 @@ function PMA_SortableTableHeader($title, $sort)
|
|||||||
if ($requested_sort == $sort) {
|
if ($requested_sort == $sort) {
|
||||||
if ($requested_sort_order == 'ASC') {
|
if ($requested_sort_order == 'ASC') {
|
||||||
$sort_order = 'DESC';
|
$sort_order = 'DESC';
|
||||||
$order_img = ' <img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 's_desc.png" width="11" height="9" alt="'. $GLOBALS['strDescending'] . '" title="'. $GLOBALS['strDescending'] . '" id="soimg' . $i . '" />';
|
$order_img = ' <img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 's_desc.png" width="11" height="9" alt="'. $GLOBALS['strDescending'] . '" title="'. $GLOBALS['strDescending'] . '" id="sort_arrow" />';
|
||||||
$order_link_params['onmouseover'] = 'if(document.getElementById(\'soimg' . $i . '\')){ document.getElementById(\'soimg' . $i . '\').src=\'' . $GLOBALS['pmaThemeImage'] . 's_asc.png\'; }';
|
$order_link_params['onmouseover'] = 'if(document.getElementById(\'sort_arrow\')){ document.getElementById(\'sort_arrow\').src=\'' . $GLOBALS['pmaThemeImage'] . 's_asc.png\'; }';
|
||||||
$order_link_params['onmouseout'] = 'if(document.getElementById(\'soimg' . $i . '\')){ document.getElementById(\'soimg' . $i . '\').src=\'' . $GLOBALS['pmaThemeImage'] . 's_desc.png\'; }';
|
$order_link_params['onmouseout'] = 'if(document.getElementById(\'sort_arrow\')){ document.getElementById(\'sort_arrow\').src=\'' . $GLOBALS['pmaThemeImage'] . 's_desc.png\'; }';
|
||||||
} else {
|
} else {
|
||||||
$order_img = ' <img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 's_asc.png" width="11" height="9" alt="'. $GLOBALS['strAscending'] . '" title="'. $GLOBALS['strAscending'] . '" id="soimg' . $i . '" />';
|
$order_img = ' <img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 's_asc.png" width="11" height="9" alt="'. $GLOBALS['strAscending'] . '" title="'. $GLOBALS['strAscending'] . '" id="sort_arrow" />';
|
||||||
$order_link_params['onmouseover'] = 'if(document.getElementById(\'soimg' . $i . '\')){ document.getElementById(\'soimg' . $i . '\').src=\'' . $GLOBALS['pmaThemeImage'] . 's_desc.png\'; }';
|
$order_link_params['onmouseover'] = 'if(document.getElementById(\'sort_arrow\')){ document.getElementById(\'sort_arrow\').src=\'' . $GLOBALS['pmaThemeImage'] . 's_desc.png\'; }';
|
||||||
$order_link_params['onmouseout'] = 'if(document.getElementById(\'soimg' . $i . '\')){ document.getElementById(\'soimg' . $i . '\').src=\'' . $GLOBALS['pmaThemeImage'] . 's_asc.png\'; }';
|
$order_link_params['onmouseout'] = 'if(document.getElementById(\'sort_arrow\')){ document.getElementById(\'sort_arrow\').src=\'' . $GLOBALS['pmaThemeImage'] . 's_asc.png\'; }';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -219,11 +219,11 @@ $_url_params = array(
|
|||||||
'db' => $db);
|
'db' => $db);
|
||||||
|
|
||||||
// Add the sort options if they exists
|
// Add the sort options if they exists
|
||||||
if ($_REQUEST['sort']) {
|
if (isset($_REQUEST['sort'])) {
|
||||||
$_url_params['sort'] = $_REQUEST['sort'];
|
$_url_params['sort'] = $_REQUEST['sort'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($_REQUEST['sort_order']) {
|
if (isset($_REQUEST['sort_order'])) {
|
||||||
$_url_params['sort_order'] = $_REQUEST['sort_order'];
|
$_url_params['sort_order'] = $_REQUEST['sort_order'];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -199,10 +199,10 @@ if (true === $cfg['SkipLockedTables']) {
|
|||||||
if (! isset($sot_ready)) {
|
if (! isset($sot_ready)) {
|
||||||
|
|
||||||
// Set some sorting defaults
|
// Set some sorting defaults
|
||||||
$sort = 'name';
|
$sort = 'Name';
|
||||||
$sort_order = 'ASC';
|
$sort_order = 'ASC';
|
||||||
|
|
||||||
if ($_REQUEST['sort']) {
|
if (isset($_REQUEST['sort'])) {
|
||||||
$sortable_name_mappings = array(
|
$sortable_name_mappings = array(
|
||||||
'table' => 'Name',
|
'table' => 'Name',
|
||||||
'records' => 'Rows',
|
'records' => 'Rows',
|
||||||
|
Reference in New Issue
Block a user