26 Mar
2010
26 Mar
'10
1:05 p.m.
The branch, QA_3_3 has been updated
via 291f2a1d1d97299b3b47dc2b9871e3646ae7d3f8 (commit)
from 459fe9e905be784bcb0d3ce8ad54486c906be938 (commit)
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 2 ++
libraries/common.lib.php | 5 +++++
libraries/tbl_links.inc.php | 1 +
3 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 5140d2e..807fe76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,8 @@ $HeadURL:
https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- bug #2967565 [insert] UNHEX not selected by default when inserting BINARY
- [navi] Changed link to git repository on main page
- bug #2972232 [menu] Import menu tab not present on main page
+- patch #2976790 [menu] Go to the upper level after table DROP,
+ thanks to Kaarel Nummert - kaarelnu
3.3.1.0 (2010-03-16)
- bug #2941037 [core] Database structure not sorted by table correctly
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 522a224..d9ff7c5 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -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']);
diff --git a/libraries/tbl_links.inc.php b/libraries/tbl_links.inc.php
index b6c9121..4731501 100644
--- a/libraries/tbl_links.inc.php
+++ b/libraries/tbl_links.inc.php
@@ -114,6 +114,7 @@ if (! $tbl_is_view && ! (isset($db_is_information_schema)
&& $db_is_information_
if (! (isset($db_is_information_schema) && $db_is_information_schema)) {
$tabs['drop']['icon'] = 'b_deltbl.png';
$tabs['drop']['link'] = 'sql.php';
+ $tabs['drop']['url_params'] = array('table' => NULL);
$tabs['drop']['text'] = $strDrop;
$tabs['drop']['args']['reload'] = 1;
$tabs['drop']['args']['purge'] = 1;
hooks/post-receive
--
phpMyAdmin