From cdfc277bb7bd3b8fad0e45d9317fdd4578282206 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 17 Mar 2010 17:48:29 -0400 Subject: [PATCH 1/3] bug #2972232 Import menu tab not present on main page --- ChangeLog | 1 + libraries/server_links.inc.php | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index cfa265d56..2cc165005 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA shown in hex - 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 3.3.1.0 (2010-03-16) - bug #2941037 [core] Database structure not sorted by table correctly diff --git a/libraries/server_links.inc.php b/libraries/server_links.inc.php index 1366baa7b..40479d2c4 100644 --- a/libraries/server_links.inc.php +++ b/libraries/server_links.inc.php @@ -87,9 +87,9 @@ $tabs['import']['icon'] = 'b_import.png'; $tabs['import']['link'] = 'server_import.php'; $tabs['import']['text'] = $strImport; -$tabs['import']['icon'] = 's_sync.png'; -$tabs['import']['link'] = 'server_synchronize.php'; -$tabs['import']['text'] = $strSynchronize; +$tabs['synchronize']['icon'] = 's_sync.png'; +$tabs['synchronize']['link'] = 'server_synchronize.php'; +$tabs['synchronize']['text'] = $strSynchronize; echo PMA_generate_html_tabs($tabs, array()); unset($tabs); From e859e311496ae25e1c6de6412084bc336f0798b9 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 22 Mar 2010 13:23:55 -0400 Subject: [PATCH 2/3] there was an extra space in the ChangeLog --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2cc165005..5140d2ef3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,7 +13,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA shown in hex - 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 +- bug #2972232 [menu] Import menu tab not present on main page 3.3.1.0 (2010-03-16) - bug #2941037 [core] Database structure not sorted by table correctly From 0f6215f70ed47a1c26743dab636fb74042d98833 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 22 Mar 2010 13:24:48 -0400 Subject: [PATCH 3/3] testing before merge --- tbl_row_action.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tbl_row_action.php b/tbl_row_action.php index d72c7d537..efcc74d7b 100644 --- a/tbl_row_action.php +++ b/tbl_row_action.php @@ -43,7 +43,7 @@ if (isset($_REQUEST['submit_mult'])) { $submit_mult = 'row_export'; } -// garvin: If the 'Ask for confirmation' button was pressed, this can only come +// If the 'Ask for confirmation' button was pressed, this can only come // from 'delete' mode, so we set it straight away. if (isset($_REQUEST['mult_btn'])) { $submit_mult = 'row_delete';