From 47d112833acb598e35798c9cb96bda9ab467a238 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

---
 ecrire/inc_version.php | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/ecrire/inc_version.php b/ecrire/inc_version.php
index b6b7905782..6bddc1de18 100644
--- a/ecrire/inc_version.php
+++ b/ecrire/inc_version.php
@@ -101,6 +101,12 @@ 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
 // qui ne sera pas execute car _ECRIRE_INC_VERSION est defini
@@ -178,16 +184,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