From d90bfd0253548c6f7b18e3bc1176beb5eca0c93b Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Thu, 3 Jan 2019 15:07:11 +0100
Subject: [PATCH] =?UTF-8?q?donn=C3=A9es=20des=20blocs=20dans=20config=20pl?=
 =?UTF-8?q?ut=C3=B4t=20que=20theme?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core.php                        | 8 +++++---
 core/module/theme/theme.php          | 7 ++++---
 core/module/theme/view/site/site.php | 8 ++++----
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/core/core.php b/core/core.php
index 54fad575..68e2b719 100644
--- a/core/core.php
+++ b/core/core.php
@@ -56,7 +56,9 @@ class common {
 			],
 			'timezone' => 'Europe/Paris',
 			'title' => 'Zwii, votre site en quelques clics !',
-			'itemsperPage' => 10
+			'itemsperPage' => 10,
+			'contenLeft' => '',
+			'contentRight' => ''
 		],
 		'core' => [
 			'dataVersion' => 0,
@@ -996,8 +998,8 @@ class common {
 		// Version 9.0.0
 		if($this->getData(['core', 'dataVersion']) < 900) {
 			$this->setData(['theme', 'site', 'blocks','100']);
-			$this->setData(['theme', 'site', 'contentLeft','']);
-			$this->setData(['theme', 'site', 'contentRight','']);
+			$this->setData(['config', 'contentLeft','']);
+			$this->setData(['config', 'contentRight','']);
 			$this->setData(['core', 'dataVersion', 900]);
 			$this->SaveData();
 		}				
diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php
index e7d0b5c0..304692da 100755
--- a/core/module/theme/theme.php
+++ b/core/module/theme/theme.php
@@ -435,9 +435,10 @@ class theme extends common {
 				'shadow' => $this->getInput('themeSiteShadow'),
 				'width' => $this->getInput('themeSiteWidth'),
 				'blocks' => $this->getInput('themeSiteBlocks'),
-				'contentLeft' => (empty($this->getInput('themeSiteContentleft', null)) ? "<p></p>" : $this->getInput('themeSiteContentleft', null)),
-				'contentRight' => (empty($this->getInput('themeSiteContentright', null)) ? "<p></p>" : $this->getInput('themeSiteContentright', null))
-				
+			]]);
+			$this->setData(['config', [	
+				'contentLeft' => (empty($this->getInput('configContentleft', null)) ? "<p></p>" : $this->getInput('configContentleft', null)),
+				'contentRight' => (empty($this->getInput('configContentright', null)) ? "<p></p>" : $this->getInput('configContentright', null))
 			]]);
 			// Valeurs en sortie
 			$this->addOutput([
diff --git a/core/module/theme/view/site/site.php b/core/module/theme/view/site/site.php
index 2ae87269..83f34a40 100755
--- a/core/module/theme/view/site/site.php
+++ b/core/module/theme/view/site/site.php
@@ -144,15 +144,15 @@
 			</div>
 			<div class='row'>
 				<div class="col6">
-					<?php echo template::textarea('themeSiteContentright', [
+					<?php echo template::textarea('configContentright', [
 							'class' => 'editorWysiwyg',
-							'value' => $this->getData(['theme', 'site', 'contentRight'])
+							'value' => $this->getData(['config', 'contentRight'])
 						]); ?>
 				</div>
 				<div class="col6">						
-					<?php echo template::textarea('themeSiteContentleft', [
+					<?php echo template::textarea('configContentleft', [
 							'class' => 'editorWysiwyg',
-							'value' => $this->getData(['theme', 'site', 'contentLeft'])
+							'value' => $this->getData(['config', 'contentLeft'])
 					]); ?>
 				</div>	
 			</div>