[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-268-gf6e3ae5

[Marc Delisle]

The branch, master has been updated
       via  f6e3ae57c50edb17dad905ca47827e7de1f63b15 (commit)
       via  291f2a1d1d97299b3b47dc2b9871e3646ae7d3f8 (commit)
      from  b994ec6934cef1b02d944969b05ace1f991dbaa7 (commit)


- Log -----------------------------------------------------------------
commit f6e3ae57c50edb17dad905ca47827e7de1f63b15
Merge: b994ec6934cef1b02d944969b05ace1f991dbaa7 291f2a1d1d97299b3b47dc2b9871e3646ae7d3f8
Author: Marc Delisle <marc at infomarc.info>
Date:   Fri Mar 26 13:02:45 2010 -0400

    Merge branch 'QA_3_3'

-----------------------------------------------------------------------

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 69a860d..51febbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -63,6 +63,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 d00b615..16c3dfb 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1588,6 +1588,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 13dbaf8..4f7b631 100644
--- a/libraries/tbl_links.inc.php
+++ b/libraries/tbl_links.inc.php
@@ -123,6 +123,7 @@ if ($tbl_is_view && ! (isset($db_is_information_schema) && $db_is_information_sc
 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