From 511b21ca9c94d2820b953117dffa0a0f23a8f171 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 1 Jul 2019 00:22:28 +0200 Subject: [PATCH] Fix for doliwamp --- build/exe/doliwamp/httpd.conf.install | 2 +- htdocs/install/check.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/exe/doliwamp/httpd.conf.install b/build/exe/doliwamp/httpd.conf.install index a23a994f670..40cc9a2f5c6 100644 --- a/build/exe/doliwamp/httpd.conf.install +++ b/build/exe/doliwamp/httpd.conf.install @@ -150,7 +150,7 @@ Require local # e-mailed. This address appears on some server-generated pages, such # as error documents. e.g. admin@your-domain.com # -ServerAdmin webmaster@localhost +ServerAdmin doliwamp@localhost # # ServerName gives the name and port that the server uses to identify itself. diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 9d6d9adbc16..43645f402ed 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -162,7 +162,7 @@ else // Check if intl methods are supported -if (empty($force_install_type) || $force_install_type != 'doliwamp') +if (empty($_SERVER["SERVER_ADMIN"]) || $_SERVER["SERVER_ADMIN"] != 'doliwamp@localhost') { if (! function_exists("locale_get_primary_language") || ! function_exists("locale_get_region")) {