From ab19d3e39e011e08688ae763105f872e66452ca0 Mon Sep 17 00:00:00 2001 From: Jsewill Date: Wed, 9 Nov 2011 09:48:19 -0600 Subject: [PATCH] Added getTVValue() to the title and description logic: Field, TV, then pagetitle if neither exist. --- .../model/breadcrumbs/breadcrumbs.class.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/core/components/breadcrumbs/model/breadcrumbs/breadcrumbs.class.php b/core/components/breadcrumbs/model/breadcrumbs/breadcrumbs.class.php index 8ec1b92..d37616b 100644 --- a/core/components/breadcrumbs/model/breadcrumbs/breadcrumbs.class.php +++ b/core/components/breadcrumbs/model/breadcrumbs/breadcrumbs.class.php @@ -172,12 +172,12 @@ public function showCurrentPage($resourceId) { if ($this->config['showCurrentCrumb']) { $titleToShow = $resource->get($this->config['titleField']) ? $resource->get($this->config['titleField']) - : $resource->get('pagetitle'); + : ($resource->getTVValue($this->config['titleField']) ? $resource->getTVValue($this->config['titleField']) : $resource->get('pagetitle')); if ($this->config['currentAsLink'] && (!$this->config['respectHidemenu'] || ($this->config['respectHidemenu'] && $resource->get('hidemenu') != 1 ))) { $descriptionToUse = ($resource->get($this->config['descField'])) ? $resource->get($this->config['descField']) - : $resource->get('pagetitle'); + : ($resource->getTVValue($this->config['descField']) ? $resource->getTVValue($this->config['descField']) : $resource->get('pagetitle')); $this->_crumbs[] = $this->getChunk('bcTplCrumbCurrentLink',array( 'resource' => $this->modx->resource->get('id'), @@ -214,11 +214,11 @@ public function getMiddleCrumbs($resourceId,&$count) { if (($this->config['showHomeCrumb'] && $parent->get('id') != $this->modx->getOption('site_start')) || (!$this->config['showHomeCrumb'])) { if (!$this->config['respectHidemenu'] || ($this->config['respectHidemenu'] && $parent->get('hidemenu') != 1)) { $titleToShow = $parent->get($this->config['titleField']) - ? $parent->get($this->config['titleField']) - : $parent->get('pagetitle'); + ? $parent->get($this->config['titleField']) + : ($parent->getTVValue($this->config['titleField']) ? $parent->getTVValue($this->config['titleField']) : $parent->get('pagetitle')); $descriptionToUse = $parent->get($this->config['descField']) ? $parent->get($this->config['descField']) - : $parent->get('pagetitle'); + : ($parent->getTVValue($this->config['descField']) ? $parent->getTVValue($this->config['descField']) : $parent->get('pagetitle')); $this->_crumbs[] = $this->getChunk('bcTplCrumbLink',array( 'resource' => $parent->get('id'), 'description' => $descriptionToUse,