From 227f5f36c47970267cca7db3137cedc94f8ad34c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 16 May 2010 22:40:54 +0000
Subject: [PATCH] Fix: Bad setup of phpMyAdmin for DoliWamp installer.
---
ChangeLog | 3 ++-
build/exe/doliwamp/config.inc.php.install | 2 +-
build/exe/doliwamp/doliwamp.iss | 1 +
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f47d9776587..f88f3aee245 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,7 +33,8 @@ For users:
- Fix: bug #29278 : SMTP fails with IP
- Fix: Default language on login page.
- Fix: Complete support of euros sign (even in PDF).
-
+- Fix: Bad setup of phpMyAdmin for DoliWamp installer.
+
For developers:
- More comments in code.
- Uniformize some code.
diff --git a/build/exe/doliwamp/config.inc.php.install b/build/exe/doliwamp/config.inc.php.install
index 5616cad3119..8d0572d8f18 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 ad9a68887ca..9143bf08ab5 100644
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -557,6 +557,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
--
GitLab