make sure we only apply this for custom and testing

joomla · Aug 10, 2019 · 8202be9 · 8202be9
1 parent f8ba0ff
commit 8202be9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/administrator/components/com_joomlaupdate/config.xml b/administrator/components/com_joomlaupdate/config.xml
@@ -28,6 +28,7 @@
 			label="COM_JOOMLAUPDATE_MINIMUM_STABILITY_LABEL"
 			description="COM_JOOMLAUPDATE_MINIMUM_STABILITY_DESC"
 			default="4"
+			showon="updatesource:testing[OR]updatesource:custom"
 			>
 			<option value="0">COM_JOOMLAUPDATE_MINIMUM_STABILITY_DEV</option>
 			<option value="1">COM_JOOMLAUPDATE_MINIMUM_STABILITY_ALPHA</option>

diff --git a/administrator/components/com_joomlaupdate/models/default.php b/administrator/components/com_joomlaupdate/models/default.php
@@ -117,8 +117,14 @@ public function refreshUpdates($force = false)
 			$cache_timeout = 3600 * JComponentHelper::getParams('com_installer')->get('cachetimeout', 6, 'int');
 		}
 
-		$updater          = JUpdater::getInstance();
-		$minimumStability = JComponentHelper::getParams('com_joomlaupdate')->get('minimum_stability', JUpdater::STABILITY_STABLE);
+		$updater               = JUpdater::getInstance();
+		$minimumStability      = JUpdater::STABILITY_STABLE;
+		$comJoomlaupdateParams = JComponentHelper::getParams('com_joomlaupdate');
+
+		if (in_array($comJoomlaupdateParams->get('updatesource', 'nochange'), ['testing', 'custom']))
+		{
+			$minimumStability = $comJoomlaupdateParams->get('minimum_stability', JUpdater::STABILITY_STABLE);
+		}
 
 		$reflection = new ReflectionObject($updater);
 		$reflectionMethod = $reflection->getMethod('findUpdates');
@@ -171,13 +177,18 @@ public function getUpdateInformation()
 		$ret['latest']    = $updateObject->version;
 		$ret['hasUpdate'] = $updateObject->version != JVERSION;
 
+		$minimumStability      = JUpdater::STABILITY_STABLE;
+		$comJoomlaupdateParams = JComponentHelper::getParams('com_joomlaupdate');
+
+		if (in_array($comJoomlaupdateParams->get('updatesource', 'nochange'), ['testing', 'custom']))
+		{
+			$minimumStability = $comJoomlaupdateParams->get('minimum_stability', JUpdater::STABILITY_STABLE);
+		}
+
 		// Fetch the full update details from the update details URL.
 		jimport('joomla.updater.update');
 		$update = new JUpdate;
-		$update->loadFromXML(
-			$updateObject->detailsurl,
-			JComponentHelper::getParams('com_joomlaupdate')->get('minimum_stability', JUpdater::STABILITY_STABLE)
-		);
+		$update->loadFromXML($updateObject->detailsurl, $minimumStability);
 
 		$ret['object'] = $update;