patch #2976790 Go to the upper level after table DROP

This commit is contained in:
Marc Delisle
2010-03-26 13:02:33 -04:00
parent 459fe9e905
commit 291f2a1d1d
3 changed files with 8 additions and 0 deletions

View File

@@ -1591,6 +1591,11 @@ function PMA_generate_html_tab($tab, $url_params = array())
$tab['attr'] .= ' title="' . htmlspecialchars($tab['warning']) . '"';
}
// If there are any tab specific URL parameters, merge those with the general URL parameters
if(! empty($tab['url_params']) && is_array($tab['url_params'])) {
$url_params = array_merge($url_params, $tab['url_params']);
}
// build the link
if (!empty($tab['link'])) {
$tab['link'] = htmlentities($tab['link']);