From f5a3aae8194a102df1ad0b223e040bbbdac24a89 Mon Sep 17 00:00:00 2001
From: fredtempez <ftempez@gmail.com>
Date: Sat, 9 Nov 2019 19:03:03 +0100
Subject: [PATCH] =?UTF-8?q?[9.2.10]=20Changement=20d'un=20nom=20de=20cl?=
 =?UTF-8?q?=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core.php                                 | 10 +++++++++-
 core/layout/main.php                          |  8 ++++----
 core/module/install/ressource/defaultdata.php |  2 +-
 core/module/theme/theme.php                   |  2 +-
 core/module/theme/view/header/header.php      |  4 ++--
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/core/core.php b/core/core.php
index 03087ba7..6636fe15 100644
--- a/core/core.php
+++ b/core/core.php
@@ -958,11 +958,19 @@ class common {
 		}
 		// Version 9.2.10
 		if($this->getData(['core', 'dataVersion']) < 9210) {
+			
 			// Utile pour l'installation d'un backup sur un autre serveur
 			$this->setData(['core', 'baseUrl', helper::baseUrl(false,false) ]);
 
-			// Préparation des clés de légendes pour la v10
+			// Suppression d'une option de hauteur de la bannière
+			if ($this->getData(['theme', 'header','height']) === 'none') {
+				$this->setData(['theme', 'header','height','150px']);
+			}	
+			// Changer le nom de la clé linkHome -> linkHomePage
+			$this->setdata(['theme','header','linkHomePage',$this->getData(['theme','header','linkHome'])]);
+			$this->deleteData(['theme','header','linkHome']);
 
+			// Préparation des clés de légendes pour la v10
 			// Construire une liste plate de parents et d'enfants
 			
 			foreach ($this->getHierarchy(null,null,null) as $parentKey=>$parentValue) {
diff --git a/core/layout/main.php b/core/layout/main.php
index 81b3976c..22f2a996 100755
--- a/core/layout/main.php
+++ b/core/layout/main.php
@@ -50,7 +50,7 @@
 			<!-- Bannière dans le fond du site -->
 			<header>	
 				<?php	
-				if ($this->getData(['theme','header','linkHome'])){
+				if ($this->getData(['theme','header','linkHomePage'])){
 				echo "<a href='" . helper::baseUrl(false) . "'>" ;}	?>
 				<?php if(
 					$this->getData(['theme', 'header', 'textHide']) === false
@@ -66,7 +66,7 @@
 					</div> <!--fin container -->
 				<?php endif; ?>
 				<?php
-				if ($this->getData(['theme','header','linkHome'])){echo "</a>";}
+				if ($this->getData(['theme','header','linkHomePage'])){echo "</a>";}
 				?>	
 			</header>
 		<?php endif; ?>
@@ -97,7 +97,7 @@
 			): ?>
 				<!-- Bannière dans le site -->
 				<?php	
-				if ($this->getData(['theme','header','linkHome'])){
+				if ($this->getData(['theme','header','linkHomePage'])){
 				echo "<a href='" . helper::baseUrl(false) . "'>" ;}	?>
 				<header <?php if($this->getData(['theme', 'header', 'position']) === 'hide'): ?>class="displayNone"<?php endif; ?>>
 					<?php if(
@@ -115,7 +115,7 @@
 					<?php endif; ?>
 				</header>
 				<?php
-				if ($this->getData(['theme','header','linkHome'])){echo "</a>";}	?>
+				if ($this->getData(['theme','header','linkHomePage'])){echo "</a>";}	?>
 				<?php endif; ?>
 			<?php if(
 				$this->getData(['theme', 'menu', 'position']) === 'site-second' ||
diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php
index d07c65f6..90a02b92 100644
--- a/core/module/install/ressource/defaultdata.php
+++ b/core/module/install/ressource/defaultdata.php
@@ -460,7 +460,7 @@ class install extends common {
 				'textColor' => 'rgba(33, 34, 35, 1)',
 				'textHide' => true,
 				'textTransform' => 'none',
-				'linkHome' => true,
+				'linkHomePage' => true,
 				'imageContainer' => 'auto'
 			],
 			'link' => [
diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php
index 01c21f4f..0f746f6b 100755
--- a/core/module/theme/theme.php
+++ b/core/module/theme/theme.php
@@ -366,7 +366,7 @@ class theme extends common {
 				'textAlign' => $this->getInput('themeHeaderTextAlign'),
 				'textColor' => $this->getInput('themeHeaderTextColor'),
 				'textHide' => $this->getInput('themeHeaderTextHide', helper::FILTER_BOOLEAN),		
-				'linkHome' => $this->getInput('themeHeaderlinkHome',helper::FILTER_BOOLEAN),
+				'linkHomePage' => $this->getInput('themeHeaderlinkHomePage',helper::FILTER_BOOLEAN),
 				'imageContainer' => $this->getInput('themeHeaderImageContainer')
 			]]);
 			// Modification de la position du menu selon la position de la bannière
diff --git a/core/module/theme/view/header/header.php b/core/module/theme/view/header/header.php
index 8db95985..990d3457 100755
--- a/core/module/theme/view/header/header.php
+++ b/core/module/theme/view/header/header.php
@@ -81,8 +81,8 @@
 							]); ?>
                     </div>
                     <div id="themeHeaderShow" class="col6">
-                        <?php echo template::checkbox('themeHeaderlinkHome', true, 'Bannière cliquable', [
-                                'checked' => $this->getData(['theme', 'header', 'linkHome'])
+                        <?php echo template::checkbox('themeHeaderlinkHomePage', true, 'Bannière cliquable', [
+                                'checked' => $this->getData(['theme', 'header', 'linkHomePage'])
                             ]); ?>
                     </div>                    
                 </div>