diff --git a/core/core.php b/core/core.php index aa0b6b2c..18fd0dce 100644 --- a/core/core.php +++ b/core/core.php @@ -546,7 +546,6 @@ class common { if ( $this->getData(['page', $page, 'content']) !== '' && file_exists(self::DATA_DIR . $lang . '/content/' . $this->getData(['page', $page, 'content'])) - && is_file(self::DATA_DIR . $lang . '/content/' . $this->getData(['page', $page, 'content'])) ) { return file_get_contents(self::DATA_DIR . $lang . '/content/' . $this->getData(['page', $page, 'content'])); } else { diff --git a/core/include/update.inc.php b/core/include/update.inc.php index 53664bce..73aebe13 100644 --- a/core/include/update.inc.php +++ b/core/include/update.inc.php @@ -1005,7 +1005,6 @@ if ($this->getData(['core', 'dataVersion']) < 11400) { } } - // Rafraichir les thèmes if (file_exists(self::DATA_DIR . 'admin.css')) { unlink (self::DATA_DIR . 'admin.css'); @@ -1014,6 +1013,26 @@ if ($this->getData(['core', 'dataVersion']) < 11400) { unlink (self::DATA_DIR . 'theme.css'); } + // Transforme les URL en références relatives + $baseUrl = $this->getData(['core', 'baseUrl']); + $baseUrl2 = str_replace('?', '', $baseUrl); + foreach ($this->getHierarchy(null,null,null) as $parentKey=>$parentValue) { + $pageList [] = $parentKey; + foreach ($parentValue as $childKey) { + $pageList [] = $childKey; + } + } + foreach ($pageList as $parentKey => $parent) { + $s = $this->getPage( $parent, self::$i18n); + // Suppression des sous-dossiers + $s = str_replace ($baseUrl, './', $s); + $s = str_replace ($baseUrl2, './', $s); + $this->setPage( $parent, $s, self::$i18n); + } + + // Suppression de la variable URL dans core + //$this->deleteData(['core', 'baseUrl']); + // Mise à jour $this->setData(['core', 'dataVersion', 11400]); } \ No newline at end of file