From fcf11da5555535cf999496a8cdddbaa72e8c965d Mon Sep 17 00:00:00 2001
From: thrax <vincent.callies@gmail.com>
Date: Sat, 20 Apr 2024 15:20:04 +0200
Subject: [PATCH] =?UTF-8?q?refactor:=20remonter=20la=20d=C3=A9claration=20?=
=?UTF-8?q?de=20timezone=20apr=C3=A8s=20spip=5Finitialisation=5Fcore;=20si?=
=?UTF-8?q?mplifier=20les=20v=C3=A9rifications.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
(cherry picked from commit 47d112833acb598e35798c9cb96bda9ab467a238)
---
ecrire/inc_version.php | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/ecrire/inc_version.php b/ecrire/inc_version.php
index 0efe72c26b..5c3b6005b2 100644
--- a/ecrire/inc_version.php
+++ b/ecrire/inc_version.php
@@ -504,6 +504,11 @@ spip_initialisation_core(
(_DIR_RACINE . _NOM_TEMPORAIRES_ACCESSIBLES)
);
+// timezone
+include_spip('inc/config');
+if ($timezone = lire_config('timezone')) {
+ date_default_timezone_set($timezone);
+}
// chargement des plugins : doit arriver en dernier
// car dans les plugins on peut inclure inc-version
@@ -578,16 +583,6 @@ if (
}
}
-// timezone
-if (function_exists('date_default_timezone_set')) {
- if (!function_exists('lire_config')) {
- include_spip('inc/config');
- }
- if (($timezone = lire_config('timezone')) && $timezone != '') {
- date_default_timezone_set($timezone);
- }
-}
-
/**
* Header "Composed-By"
*
--
GitLab