diff --git a/administrator/components/com_content/config.xml b/administrator/components/com_content/config.xml index 15c8fabf2e085..5ffbd36016d2f 100644 --- a/administrator/components/com_content/config.xml +++ b/administrator/components/com_content/config.xml @@ -403,7 +403,7 @@ - + - + + + + + + + + + + + get('show_intro')) : ?> item->event->afterDisplayTitle; ?> -item->event->beforeDisplayContent; ?> item->introtext; ?> +item->event->beforeDisplayContent; ?> +lead_fulltext && $this->item->leading && $this->item->readmore) { ?> + get('show_intro') ? $this->item->introtext . ' ' : '') . $this->item->fulltext; ?> + + item->introtext; ?> + $this->item, 'params' => $params, 'position' => 'below')); ?> -get('show_readmore') && $this->item->readmore) : +get('show_readmore') && $this->item->readmore && !($this->lead_fulltext && $this->item->leading) ) : if ($params->get('access-view')) : $link = JRoute::_(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid)); else : diff --git a/components/com_content/views/category/view.html.php b/components/com_content/views/category/view.html.php index 2f863a6e8efe2..d6663954b2967 100644 --- a/components/com_content/views/category/view.html.php +++ b/components/com_content/views/category/view.html.php @@ -77,6 +77,7 @@ public function display($tpl = null) $numLeading = $params->def('num_leading_articles', 1); $numIntro = $params->def('num_intro_articles', 4); $numLinks = $params->def('num_links', 4); + $this->lead_fulltext = $params->def('fulltext_leading_articles', 0); // Compute the article slugs and prepare introtext (runs content plugins). foreach ($this->items as $item) @@ -148,6 +149,7 @@ public function display($tpl = null) { if ($i < $numLeading) { + $item->leading = true; $this->lead_items[] = $item; }