From 7e0574f27725d14ec4c40061c9bc1006bb9902ff Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Sun, 24 May 2020 16:03:33 +0200 Subject: [PATCH] =?UTF-8?q?Revert=20"dev2=20d=C3=A9placer=20le=20chemin=20?= =?UTF-8?q?de=20fer"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 81f55490d3699b44b0f07821e4084e06b84513e1. --- core/core.php | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/core/core.php b/core/core.php index 35fc63b1..33498b07 100755 --- a/core/core.php +++ b/core/core.php @@ -36,7 +36,7 @@ class common { const THUMBS_WIDTH = 640; // Numéro de version - const ZWII_VERSION = '10.1.001.dev2'; + const ZWII_VERSION = '10.1.001.dev1'; const ZWII_UPDATE_CHANNEL = "v10"; public static $actions = []; @@ -1635,6 +1635,18 @@ class core extends common { } } } + + // Breadcrumb + $title = $this->getData(['page', $this->getUrl(0), 'title']); + if (!empty($this->getData(['page', $this->getUrl(0), 'parentPageId'])) && + $this->getData(['page', $this->getUrl(0), 'breadCrumb'])) { + $title = '' . + ucfirst($this->getData(['page',$this->getData(['page', $this->getUrl(0), 'parentPageId']), 'title'])) . + ' › '. + $this->getData(['page', $this->getUrl(0), 'title']); + } // Importe la page if( @@ -1642,18 +1654,6 @@ class core extends common { AND $this->getData(['page', $this->getUrl(0), 'moduleId']) === '' AND $access ) { - // Breadcrumb - $title = $this->getData(['page', $this->getUrl(0), 'title']); - if (!empty($this->getData(['page', $this->getUrl(0), 'parentPageId'])) && - $this->getData(['page', $this->getUrl(0), 'breadCrumb'])) { - $title = '' . - ucfirst($this->getData(['page',$this->getData(['page', $this->getUrl(0), 'parentPageId']), 'title'])) . - ' › '. - $this->getData(['page', $this->getUrl(0), 'title']); - } - // Import de la page $this->addOutput([ 'title' => $title, 'content' => $this->getData(['page', $this->getUrl(0), 'content']),