From 59e43b289fa5b1403bbf3486719c8b92c398a06e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 16 May 2010 22:39:17 +0000
Subject: [PATCH] Fix: Bad setup of phpMyAdmin for DoliWamp installer.

---
 ChangeLog                                 | 5 +++++
 build/exe/doliwamp/config.inc.php.install | 2 +-
 build/exe/doliwamp/doliwamp.iss           | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 1f47f112ab2..d8c6a733cc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 English Dolibarr ChangeLog
 
+***** ChangeLog for 2.8.2 compared to 2.8.1 *****
+For users:
+- Fix: Bad setup of phpMyAdmin for DoliWamp installer.
+
+
 ***** ChangeLog for 2.8.1 compared to 2.8 *****
 For users:
 - Fix: Works on database with _ in name.
diff --git a/build/exe/doliwamp/config.inc.php.install b/build/exe/doliwamp/config.inc.php.install
index ac3c9fc07a1..618bb6c8a90 100644
--- a/build/exe/doliwamp/config.inc.php.install
+++ b/build/exe/doliwamp/config.inc.php.install
@@ -55,7 +55,7 @@ $i = 0;
 // full server array, just define values you need to change.
 $i++;
 $cfg['Servers'][$i]['host']          = 'localhost'; // MySQL hostname or IP address
-$cfg['Servers'][$i]['port']          = '3307';      // MySQL port - leave blank for default port
+$cfg['Servers'][$i]['port']          = 'WAMPMYSQLPORT';      // MySQL port - leave blank for default port
 $cfg['Servers'][$i]['socket']        = '';          // Path to the socket - leave blank for default socket
 $cfg['Servers'][$i]['connect_type']  = 'tcp';       // How to connect to MySQL server ('tcp' or 'socket')
 $cfg['Servers'][$i]['extension']     = 'mysqli';     // The php MySQL extension to use ('mysql' or 'mysqli')
diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss
index 9bb8b727bb6..b4eea89a454 100644
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -551,6 +551,7 @@ begin
 	        // sinon on prends le fichier par defaut
 	        LoadStringFromFile (srcFile, srcContents);
 	        StringChange (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass);
+	        StringChange (srcContents, 'WAMPMYSQLPORT', myport);
 	        SaveStringToFile(destFile,srcContents, False);
 		    end