From 14fedd0935050dec8eb66ece986da568f64a1aa3 Mon Sep 17 00:00:00 2001
From: Prof Langues <Prof_LVE@EDU.UA>
Date: Tue, 23 Apr 2019 15:48:02 +0200
Subject: [PATCH] =?UTF-8?q?[9.0.21]=20Pages=20parentes=20non=20s=C3=A9lect?=
 =?UTF-8?q?ionnables=20dans=20lien=20de=20TinyMCE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core.php | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/core/core.php b/core/core.php
index b6277937..6aa4abed 100644
--- a/core/core.php
+++ b/core/core.php
@@ -28,7 +28,7 @@ class common {
 	const GROUP_ADMIN = 3;
 
 	// Numéro de version stable
-	const ZWII_VERSION = '9.0.20';
+	const ZWII_VERSION = '9.0.21';
 
 	public static $actions = [];
 	public static $coreModuleIds = [
@@ -553,23 +553,17 @@ class common {
 			$children = [];
 			// Exclure les barres
 			if ($this->getData(['page', $parentId, 'block']) !== 'bar' ) { 
+				$parents [] = ['title' => $this->getData(['page', $parentId, 'title']) ,
+							'value'=> $rewrite.$parentId 
+							];	
 				foreach($childIds as $childId) {
-					$children [] = ['title' => $this->getData(['page', $childId, 'title']) ,
+					$parents [] = ['title' => $this->getData(['page', $parentId, 'title']) . ' / '.  $this->getData(['page', $childId, 'title']) ,
 								'value'=> $rewrite.$childId
-					];				
+						];				
 				}
-				if (empty($childIds)) {						
-					$parents [] = ['title' => $this->getData(['page', $parentId, 'title']) ,
-									'value'=> $rewrite.$parentId 		
-					];	
-				} else {
-					$parents [] = ['title' => $this->getData(['page', $parentId, 'title']) ,
-									'value'=> $rewrite.$parentId ,  
-									'menu' => $children 
-					];							
-				} 											
 			}
 		}
+
 		
 		// 3 tentatives
 		for($i = 0; $i < 3; $i++) {