diff --git a/vbcms-core/defaultPages/404.php b/vbcms-core/defaultPages/404.php
index f2997d1d21c1abaa1de28aa1832354bd2153a7b9..6d8138aeb1fec154bd607043bd032936e0fc7394 100644
--- a/vbcms-core/defaultPages/404.php
+++ b/vbcms-core/defaultPages/404.php
@@ -1,7 +1,11 @@
<?php
-if(isset($_SERVER['HTTPS'])) $http = "https"; else $http = "http";
-$url = parse_url("$http://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]");
-$websiteUrl = $url["scheme"]."://".$url["host"]."/";
+if(isset($bdd)){
+ $websiteUrl = VBcmsGetSetting("websiteUrl");
+}else{
+ if(isset($_SERVER['HTTPS'])) $http = "https"; else $http = "http";
+ $url = parse_url("$http://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]");
+ $websiteUrl = $url["scheme"]."://".$url["host"]."/";
+}
?>
<!DOCTYPE html>
<html lang="fr">
diff --git a/vbcms-core/defaultPages/ext404.php b/vbcms-core/defaultPages/ext404.php
index a47864dbb07cf3fab3a545b741e5a29ed1468d69..5177c02fe6824ce4f6f4df2432d3a820fcfd759c 100644
--- a/vbcms-core/defaultPages/ext404.php
+++ b/vbcms-core/defaultPages/ext404.php
@@ -1,7 +1,11 @@
<?php
-if(isset($_SERVER['HTTPS'])) $http = "https"; else $http = "http";
-$url = parse_url("$http://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]");
-$websiteUrl = $url["scheme"]."://".$url["host"]."/";
+if(isset($bdd)){
+ $websiteUrl = VBcmsGetSetting("websiteUrl");
+}else{
+ if(isset($_SERVER['HTTPS'])) $http = "https"; else $http = "http";
+ $url = parse_url("$http://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]");
+ $websiteUrl = $url["scheme"]."://".$url["host"]."/";
+}
?>
<!DOCTYPE html>
<html lang="fr">
diff --git a/vbcms-core/defaultPages/index.php b/vbcms-core/defaultPages/index.php
index 4f424c78879fe7b7c5b188333fa4e8a83f2c3c1c..33a814f1d3f6fda340054d2413a7de2384919112 100644
--- a/vbcms-core/defaultPages/index.php
+++ b/vbcms-core/defaultPages/index.php
@@ -1,7 +1,11 @@
<?php
-if(isset($_SERVER['HTTPS'])) $http = "https"; else $http = "http";
-$url = parse_url("$http://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]");
-$websiteUrl = $url["scheme"]."://".$url["host"]."/";
+if(isset($bdd)){
+ $websiteUrl = VBcmsGetSetting("websiteUrl");
+}else{
+ if(isset($_SERVER['HTTPS'])) $http = "https"; else $http = "http";
+ $url = parse_url("$http://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]");
+ $websiteUrl = $url["scheme"]."://".$url["host"]."/";
+}
?>
<!DOCTYPE html>
<html lang="fr">
diff --git a/vbcms-core/functions.php b/vbcms-core/functions.php
index 2ccbc674dfd74d81f51c7353ec82c96804ca4939..931dfc1de1842196c3e2d794ea3565d8631002b9 100644
--- a/vbcms-core/functions.php
+++ b/vbcms-core/functions.php
@@ -152,6 +152,7 @@ function show404($type){
if ($type=="client") {
// Affiche la page 404 du site client
// A savoir que les pages 404 des modules sont gérées par ces derniers
+ global $bdd;
include $GLOBALS['vbcmsRootPath'].'/vbcms-core/defaultPages/404.php';
} elseif($type=="admin") {
diff --git a/vbcms-core/variables.php b/vbcms-core/variables.php
index f245a1a1b93e7ab19388ec9e2f5070caf28e0902..8ab73eded501b0b827123467a3076becddb20e12 100644
--- a/vbcms-core/variables.php
+++ b/vbcms-core/variables.php
@@ -14,5 +14,8 @@ if (!empty($_SERVER['HTTP_CLIENT_IP'])) {
if(isset($_SERVER['HTTPS'])) $http = "https"; else $http = "http";
// Variables permettant la gestion des pages à afficher
-$url = parse_url("$http://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]");
-$urlPath = explode("/", $url["path"]);
+$url = parse_url("$http://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]");
+if(!isset($urlPath)){
+ $urlPath = explode("/", $url["path"]);
+}
+