Merge branch 'staging' into patch-3

joomla · Aug 23, 2019 · 5116eca · 5116eca
2 parents a403e73 + f2bd913
commit 5116eca
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git 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; ?>

diff --git 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'} : '';

diff --git 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');