The branch, master has been updated via 767d16a8fa52a2d9ee30e3ed15b2f83c398bc027 (commit) from 27a56224ff4a059593fb3c50a8385a7ee4027179 (commit)

- Log ----------------------------------------------------------------- commit 767d16a8fa52a2d9ee30e3ed15b2f83c398bc027 Author: Marc Delisle marc@infomarc.info Date: Wed Mar 17 17:50:23 2010 -0400

bug #2972232 Import menu tab not present on main page

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

Summary of changes: ChangeLog | 1 + libraries/server_links.inc.php | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog index b20e630..ab7277c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -58,6 +58,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 1366baa..40479d2 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);

hooks/post-receive