[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5340-g6ea4101

[Marc Delisle]

The branch, master has been updated
       via  6ea41018b2c17ad01f80aea6aefd3b7a1687fd0b (commit)
       via  768de14815c5076a560ad3d1c46d18198f60edf0 (commit)
      from  f6ef0c87a814d96cea4a1e868fcac15935deca13 (commit)


- Log -----------------------------------------------------------------
commit 6ea41018b2c17ad01f80aea6aefd3b7a1687fd0b
Merge: f6ef0c87a814d96cea4a1e868fcac15935deca13 768de14815c5076a560ad3d1c46d18198f60edf0
Author: Marc Delisle <marc at infomarc.info>
Date:   Mon Jul 12 09:01:05 2010 -0400

    Merge branch 'QA_3_3'

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

Summary of changes:
 libraries/export/csv.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/export/csv.php b/libraries/export/csv.php
index d4b1811..8e1973f 100644
--- a/libraries/export/csv.php
+++ b/libraries/export/csv.php
@@ -75,10 +75,10 @@ function PMA_exportHeader() {
             // as tested on Windows with Excel 2002 and Excel 2007
             $csv_separator = ';';
             break;
-        case 'max_excel2003':
+        case 'mac_excel2003':
             $csv_separator = ';';
             break;
-        case 'max_excel2008':
+        case 'mac_excel2008':
             $csv_separator = ',';
             break;
         }


hooks/post-receive
-- 
phpMyAdmin