From a805e10a826695f859aa16fa8a16d7c45875f6bf Mon Sep 17 00:00:00 2001
From: SharkyKZ <sharkykz@gmail.com>
Date: Thu, 22 Aug 2019 13:50:06 +0300
Subject: [PATCH 1/3] Remove unneeded queries in featured feed (#25965)

---
 components/com_content/views/featured/view.feed.php | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/components/com_content/views/featured/view.feed.php b/components/com_content/views/featured/view.feed.php
index c5cf5c70c6125..92b247356405d 100644
--- a/components/com_content/views/featured/view.feed.php
+++ b/components/com_content/views/featured/view.feed.php
@@ -50,15 +50,6 @@ public function display($tpl = null)
 			// URL link to article
 			$link = JRoute::_(ContentHelperRoute::getArticleRoute($row->slug, $row->catid, $row->language));
 
-			// Get row fulltext
-			$db = JFactory::getDbo();
-			$query = $db->getQuery(true)
-				->select($db->quoteName('fulltext'))
-				->from($db->quoteName('#__content'))
-				->where($db->quoteName('id') . ' = ' . $row->id);
-			$db->setQuery($query);
-			$row->fulltext = $db->loadResult();
-
 			$description = '';
 			$obj = json_decode($row->images);
 			$introImage = isset($obj->{'image_intro'}) ? $obj->{'image_intro'} : '';

From 8ec7c647298347237853c751f36a5788b05c7a19 Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Thu, 22 Aug 2019 19:05:12 +0200
Subject: [PATCH 2/3] catch broken confirmConsent configuration (#25858)

---
 plugins/content/confirmconsent/fields/consentbox.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/plugins/content/confirmconsent/fields/consentbox.php b/plugins/content/confirmconsent/fields/consentbox.php
index 5c02d84e2197e..b8a34e379dc28 100644
--- a/plugins/content/confirmconsent/fields/consentbox.php
+++ b/plugins/content/confirmconsent/fields/consentbox.php
@@ -235,6 +235,15 @@ private function getAssignedArticleUrl()
 			);
 		}
 
+		if (!is_object($article))
+		{
+			// We have not found the article object lets show a 404 to the user
+			return Route::_(
+				'index.php?option=com_content&view=article&id='
+				. $this->articleid . '&tmpl=component'
+			);
+		}
+
 		// Register ContentHelperRoute
 		JLoader::register('ContentHelperRoute', JPATH_BASE . '/components/com_content/helpers/route.php');
 

From f2bd91398d95c432402cd8b874fa3d56f6029e7f Mon Sep 17 00:00:00 2001
From: ReLater <ReLater@users.noreply.github.com>
Date: Thu, 22 Aug 2019 19:06:26 +0200
Subject: [PATCH 3/3] Remove unnecessary  $params->get('show_author') (#25964)

---
 components/com_content/views/article/tmpl/default.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/components/com_content/views/article/tmpl/default.php b/components/com_content/views/article/tmpl/default.php
index ad21b37776bf6..a4b29c57ba35e 100644
--- a/components/com_content/views/article/tmpl/default.php
+++ b/components/com_content/views/article/tmpl/default.php
@@ -47,13 +47,11 @@
 		</div>
 		<div class="clearfix"> </div>
 	<?php endif; ?>
-	<?php if ($params->get('show_title') || $params->get('show_author')) : ?>
+	<?php if ($params->get('show_title')) : ?>
 	<div class="page-header">
-		<?php if ($params->get('show_title')) : ?>
-			<h2 itemprop="headline">
-				<?php echo $this->escape($this->item->title); ?>
-			</h2>
-		<?php endif; ?>
+		<h2 itemprop="headline">
+			<?php echo $this->escape($this->item->title); ?>
+		</h2>
 		<?php if ($this->item->state == 0) : ?>
 			<span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span>
 		<?php endif; ?>