Merge branch 'staging' into staging

.github/CODEOWNERS

@@ -35,19 +35,19 @@ libraries/src/Updater/*  @rdeutz @wilsonge @zero-24
 build/jenkins/*  @rdeutz
 build/travis/*  @rdeutz
 tests/codeception/*  @rdeutz
-tests/javascript/*  @dgrammatiko @rdeutz
+tests/javascript/*  @wilsonge @rdeutz
 tests/unit/*  @rdeutz
 .appveyor.yml  @rdeutz
 .drone.yml  @rdeutz
 .hound.yml  @wilsonge
 .travis.yml  @rdeutz
 appveyor-phpunit.xml  @rdeutz
 codeception.yml  @rdeutz
-karma.conf.js  @dgrammatiko @rdeutz
+karma.conf.js  @wilsonge @rdeutz
 phpunit.xml.dist  @rdeutz
 RoboFile.dist.ini  @rdeutz
 RoboFile.php  @rdeutz
 travis-phpunit.xml  @rdeutz
 
 # Core JS
-media/*/js/*  @dgrammatiko
+media/*/js/*  @wilsonge

administrator/components/com_installer/models/update.php

@@ -255,9 +255,6 @@ public function getDisabledUpdateSites()
 	 */
 	public function findUpdates($eid = 0, $cache_timeout = 0, $minimum_stability = JUpdater::STABILITY_STABLE)
 	{
-		// Purge the updates list
-		$this->purge();
-
 		JUpdater::getInstance()->findUpdates($eid, $cache_timeout, $minimum_stability);
 
 		return true;

components/com_content/views/featured/tmpl/default_item.php

@@ -11,7 +11,6 @@
 
 // Create a shortcut for params.
 $params  = &$this->item->params;
-$images  = json_decode($this->item->images);
 $canEdit = $this->item->params->get('access-edit');
 $info    = $this->item->params->get('info_block_position', 0);
 
@@ -65,9 +64,7 @@
 	<?php echo JLayoutHelper::render('joomla.content.tags', $this->item->tags->itemTags); ?>
 <?php endif; ?>
 
-<?php if (isset($images->image_intro) && !empty($images->image_intro)) : ?>
-	<?php echo JLayoutHelper::render('joomla.content.intro_image', $this->item); ?>
-<?php endif; ?>
+<?php echo JLayoutHelper::render('joomla.content.intro_image', $this->item); ?>
 
 <?php // Content is generated by content plugin event "onContentBeforeDisplay" ?>
 <?php echo $this->item->event->beforeDisplayContent; ?>