✨ Set mautic timezone param to match PHP

madmath03 · madmath03 · commit e19871c58b8b · 2019-07-30T17:42:36.000+02:00
diff --git a/apache/makeconfig.php b/apache/makeconfig.php
@@ -36,6 +36,10 @@
     $parameters['trusted_proxies'] = $proxies;
 }
 
+if(array_key_exists('PHP_INI_DATE_TIMEZONE', $_ENV)) {
+    $parameters['default_timezone'] = $_ENV['PHP_INI_DATE_TIMEZONE'];
+}
+
 $path     = '/var/www/html/app/config/local.php';
 $rendered = "<?php\n\$parameters = ".var_export($parameters, true).";\n";
 
diff --git a/beta-apache/makeconfig.php b/beta-apache/makeconfig.php
@@ -33,6 +33,10 @@
     $parameters['trusted_proxies'] = $proxies;
 }
 
+if(array_key_exists('PHP_INI_DATE_TIMEZONE', $_ENV)) {
+    $parameters['default_timezone'] = $_ENV['PHP_INI_DATE_TIMEZONE'];
+}
+
 $path     = '/var/www/html/app/config/local.php';
 $rendered = "<?php\n\$parameters = ".var_export($parameters, true).";\n";
 
diff --git a/beta-fpm/makeconfig.php b/beta-fpm/makeconfig.php
@@ -33,6 +33,10 @@
     $parameters['trusted_proxies'] = $proxies;
 }
 
+if(array_key_exists('PHP_INI_DATE_TIMEZONE', $_ENV)) {
+    $parameters['default_timezone'] = $_ENV['PHP_INI_DATE_TIMEZONE'];
+}
+
 $path     = '/var/www/html/app/config/local.php';
 $rendered = "<?php\n\$parameters = ".var_export($parameters, true).";\n";
 
diff --git a/common/makeconfig.php b/common/makeconfig.php
@@ -36,6 +36,10 @@
     $parameters['trusted_proxies'] = $proxies;
 }
 
+if(array_key_exists('PHP_INI_DATE_TIMEZONE', $_ENV)) {
+    $parameters['default_timezone'] = $_ENV['PHP_INI_DATE_TIMEZONE'];
+}
+
 $path     = '/var/www/html/app/config/local.php';
 $rendered = "<?php\n\$parameters = ".var_export($parameters, true).";\n";
 
diff --git a/fpm/makeconfig.php b/fpm/makeconfig.php
@@ -36,6 +36,10 @@
     $parameters['trusted_proxies'] = $proxies;
 }
 
+if(array_key_exists('PHP_INI_DATE_TIMEZONE', $_ENV)) {
+    $parameters['default_timezone'] = $_ENV['PHP_INI_DATE_TIMEZONE'];
+}
+
 $path     = '/var/www/html/app/config/local.php';
 $rendered = "<?php\n\$parameters = ".var_export($parameters, true).";\n";
 

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,10 @@`
`36`	`36`	`$parameters['trusted_proxies'] = $proxies;`
`37`	`37`	`}`
`38`	`38`
	`39`	`+if(array_key_exists('PHP_INI_DATE_TIMEZONE', $_ENV)) {`
	`40`	`+ $parameters['default_timezone'] = $_ENV['PHP_INI_DATE_TIMEZONE'];`
	`41`	`+}`
	`42`	`+`
`39`	`43`	`$path = '/var/www/html/app/config/local.php';`
`40`	`44`	`$rendered = "<?php\n\$parameters = ".var_export($parameters, true).";\n";`
`41`	`45`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,10 @@`
`33`	`33`	`$parameters['trusted_proxies'] = $proxies;`
`34`	`34`	`}`
`35`	`35`
	`36`	`+if(array_key_exists('PHP_INI_DATE_TIMEZONE', $_ENV)) {`
	`37`	`+ $parameters['default_timezone'] = $_ENV['PHP_INI_DATE_TIMEZONE'];`
	`38`	`+}`
	`39`	`+`
`36`	`40`	`$path = '/var/www/html/app/config/local.php';`
`37`	`41`	`$rendered = "<?php\n\$parameters = ".var_export($parameters, true).";\n";`
`38`	`42`