From 6a3150ef2c1f084dc7ae28fdcab79b3cb0f69c9e Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Sun, 30 Dec 2018 18:33:37 +0100
Subject: [PATCH] =?UTF-8?q?v9.0.0=20:=20import=20du=20th=C3=A8me=20ok=20+?=
 =?UTF-8?q?=20correction=20readData?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core.php               | 26 ++++++++++----------------
 core/module/theme/theme.php |  7 +------
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/core/core.php b/core/core.php
index 1ea2cb01..12ff46a6 100644
--- a/core/core.php
+++ b/core/core.php
@@ -526,19 +526,17 @@ class common {
 	}
 
 	public function readData() {
-		if($this->data === []) {
-			// Trois tentatives
-			for($i = 0; $i < 3; $i++) {
-				$this->setData([json_decode(file_get_contents('site/data/core.json'), true) + json_decode(file_get_contents('site/data/theme.json'), true)]);
-				if($this->data) {
-					break;
-				}
-				elseif($i === 2) {
-					exit('Unable to read data file.');
-				}
-				// Pause de 10 millisecondes
-				usleep(10000);
+		// Trois tentatives
+		for($i = 0; $i < 3; $i++) {
+			$this->setData([json_decode(file_get_contents('site/data/core.json'), true) + json_decode(file_get_contents('site/data/theme.json'), true)]);
+			if($this->data) {
+				break;
 			}
+			elseif($i === 2) {
+				exit('Unable to read data file.');
+			}
+			// Pause de 10 millisecondes
+			usleep(10000);
 		}
 	}
 
@@ -1244,11 +1242,9 @@ class core extends common {
 				'content' => $this->getData(['page', $this->getUrl(0), 'content']),
 				'metaDescription' => $this->getData(['page', $this->getUrl(0), 'metaDescription']),
 				'metaTitle' => $this->getData(['page', $this->getUrl(0), 'metaTitle']),
-				// Menu image
 				'typeMenu' => $this->getData(['page', $this->getUrl(0), 'typeMenu']),
 				'iconUrl' => $this->getData(['page', $this->getUrl(0), 'iconUrl']),
 				'disable' => $this->getData(['page', $this->getUrl(0), 'disable'])
-				// Menu Image
 			]);
 		}
 		// Importe le module
@@ -1260,11 +1256,9 @@ class core extends common {
 					'title' => $this->getData(['page', $this->getUrl(0), 'title']),
 					'metaDescription' => $this->getData(['page', $this->getUrl(0), 'metaDescription']),
 					'metaTitle' => $this->getData(['page', $this->getUrl(0), 'metaTitle']),
-					// Menu image
 					'typeMenu' => $this->getData(['page', $this->getUrl(0), 'typeMenu']),
 					'iconUrl' => $this->getData(['page', $this->getUrl(0), 'iconUrl']),
 		    		'disable' => $this->getData(['page', $this->getUrl(0), 'disable'])
-					// Menu image
 				]);
 				$pageContent = $this->getData(['page', $this->getUrl(0), 'content']);
 			}
diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php
index 24b4ec9a..7ee58d26 100755
--- a/core/module/theme/theme.php
+++ b/core/module/theme/theme.php
@@ -454,14 +454,9 @@ class theme extends common {
 			if ($zip->open('site/file/source/'.$zipFilename) === TRUE) {
 				$zip->extractTo('.');
 				$zip->close();
-				file_put_contents('site/data/custom.css', file_get_contents('core/module/theme/resource/custom.css'));
-				// Import du thème
-				die();			
 			// Valeurs en sortie
 			$this->addOutput([
-				'notification' => 'Le thème <b>'.$zipFilename.'</b> a été importé',
-				'redirect' => helper::baseUrl() . 'theme',
-				'state' => true
+				'redirect' => helper::baseUrl() . 'theme'
 			]);
 			} else {
 				$this->addOutput([