From fc7bfdd316e81323dca8ff22beba6b18a4402ddd Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Mon, 23 Mar 2020 16:16:45 +0100 Subject: [PATCH] =?UTF-8?q?[9.2.26]=20=C3=A9tendre=20constantes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/layout/blank.php | 4 ++-- core/layout/light.php | 4 ++-- core/layout/main.php | 16 ++++++++-------- core/layout/popup.php | 16 ++++++++-------- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/core/layout/blank.php b/core/layout/blank.php index f89039f8..3627afda 100755 --- a/core/layout/blank.php +++ b/core/layout/blank.php @@ -13,8 +13,8 @@ showStyle(); ?> - - + + showContent(); ?> showScript(); ?> diff --git a/core/layout/light.php b/core/layout/light.php index 4457195d..ed20d743 100755 --- a/core/layout/light.php +++ b/core/layout/light.php @@ -13,8 +13,8 @@ showStyle(); ?> - - + + showNotification(); ?> diff --git a/core/layout/main.php b/core/layout/main.php index facdcd14..d11944ab 100755 --- a/core/layout/main.php +++ b/core/layout/main.php @@ -12,11 +12,11 @@ showVendor(); ?> showAnalytics(); ?> - - + + showStyle(); ?> - @@ -176,8 +176,8 @@ in_array($this->getUrl(1),$pattern) ) ) { // Pleine page en mode configuration $layout->showContent(); - if (file_exists('site/data/body.inc.html')) { - include('site/data/body.inc.html'); + if (file_exists(self::DATA_DIR . 'body.inc.html')) { + include( self::DATA_DIR . 'body.inc.html'); } } else { ?> @@ -187,8 +187,8 @@
showBarContentLeft(); ?>
showContent(); - if (file_exists('site/data/body.inc.html')) { - include('site/data/body.inc.html'); + if (file_exists(self::DATA_DIR . 'body.inc.html')) { + include(self::DATA_DIR . 'body.inc.html'); } ?>
diff --git a/core/layout/popup.php b/core/layout/popup.php index c44555bd..fa3cbd53 100644 --- a/core/layout/popup.php +++ b/core/layout/popup.php @@ -12,11 +12,11 @@ showVendor(); ?> showAnalytics(); ?> - - + + showStyle(); ?> - @@ -53,8 +53,8 @@ in_array($this->getUrl(1),$pattern) ) ) { // Pleine page en mode configuration $layout->showContent(); - if (file_exists('site/data/body.inc.html')) { - include('site/data/body.inc.html'); + if (file_exists(self::DATA_DIR . 'body.inc.html')) { + include(self::DATA_DIR . 'body.inc.html'); } } else { ?> @@ -64,8 +64,8 @@
showBarContentLeft(); ?>
showContent(); - if (file_exists('site/data/body.inc.html')) { - include('site/data/body.inc.html'); + if (file_exists(self::DATA_DIR . 'body.inc.html')) { + include(self::DATA_DIR . 'body.inc.html'); } ?>