From 46ced373be59380f1706e6a48f3065be2b02ea71 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 30 Jun 2019 23:52:28 +0200
Subject: [PATCH] Fix for doliwamp

---
 build/exe/doliwamp/install.forced.php.install |  1 +
 htdocs/install/check.php                      | 22 ++++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/build/exe/doliwamp/install.forced.php.install b/build/exe/doliwamp/install.forced.php.install
index 5b186c17268..c59b373a7a0 100644
--- a/build/exe/doliwamp/install.forced.php.install
+++ b/build/exe/doliwamp/install.forced.php.install
@@ -5,6 +5,7 @@
 // during install process to be used.
 //
 //
+$force_install_type='doliwamp';
 $force_install_noedit=2;		// 1=To block vars specific to distrib, 2 to block all technical parameters
 $force_install_message='KeepDefaultValuesWamp';
 $force_install_main_data_root='WAMPROOT/dolibarr_documents';
diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index 0b98183904a..9d6d9adbc16 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -161,18 +161,20 @@ else
 }
 
 
-// Check if UTF8 supported
-if (! function_exists("locale_get_primary_language") || ! function_exists("locale_get_region"))
+// Check if intl methods are supported
+if (empty($force_install_type) || $force_install_type != 'doliwamp')
 {
-    $langs->load("errors");
-    print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportIntl")."<br>\n";
-    // $checksok=0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
+	if (! function_exists("locale_get_primary_language") || ! function_exists("locale_get_region"))
+	{
+	    $langs->load("errors");
+	    print '<img src="../theme/eldy/img/warning.png" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportIntl")."<br>\n";
+	    // $checksok=0;		// If ko, just warning. So check must still be 1 (otherwise no way to install)
+	}
+	else
+	{
+	    print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportIntl")."<br>\n";
+	}
 }
-else
-{
-    print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("PHPSupportIntl")."<br>\n";
-}
-
 
 
 // Check memory