[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_1RC1-65-gcdfc277

Marc Delisle lem9 at users.sourceforge.net
Wed Mar 17 22:51:50 CET 2010


The branch, QA_3_3 has been updated
       via  cdfc277bb7bd3b8fad0e45d9317fdd4578282206 (commit)
      from  142b1e2183660d25cb4827c56f8760f4cb66e714 (commit)


- Log -----------------------------------------------------------------
commit cdfc277bb7bd3b8fad0e45d9317fdd4578282206
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Mar 17 17:48:29 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 cfa265d..2cc1650 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 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
-- 
phpMyAdmin




More information about the Git mailing list