[4.2] Move check for discoverable extensions to model

administrator/components/com_installer/src/Model/DiscoverModel.php

@@ -305,4 +305,24 @@ protected function getEmptyStateQuery()
 
 		return $query;
 	}
+
+	/**
+	 * Checks uninstalled extensions in extensions table.
+	 *
+	 * @return  boolean  True if there are discovered extensions on the database.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function checkExtensions()
+	{
+		$db    = $this->getDatabase();
+		$query = $db->getQuery(true)
+			->select('*')
+			->from($db->quoteName('#__extensions'))
+			->where($db->quoteName('state') . ' = -1');
+		$db->setQuery($query);
+		$discoveredExtensions = $db->loadObjectList();
+
+		return count($discoveredExtensions) > 0;
+	}
 }

administrator/components/com_installer/src/View/Discover/HtmlView.php

@@ -43,9 +43,9 @@ class HtmlView extends InstallerViewDefault
 	public function display($tpl = null)
 	{
 		// Run discover from the model.
-		if (!$this->checkExtensions())
+		if (!$this->getModel()->checkExtensions())
 		{
-			$this->getModel('discover')->discover();
+			$this->getModel()->discover();
 		}
 
 		// Get data from the model.
@@ -92,26 +92,4 @@ protected function addToolbar()
 
 		ToolbarHelper::help('Extensions:_Discover');
 	}
-
-	/**
-	 * Check extensions.
-	 *
-	 * Checks uninstalled extensions in extensions table.
-	 *
-	 * @return  boolean  True if there are discovered extensions on the database.
-	 *
-	 * @since   3.5
-	 */
-	public function checkExtensions()
-	{
-		$db = Factory::getDbo();
-		$query = $db->getQuery(true)
-			->select('*')
-			->from($db->quoteName('#__extensions'))
-			->where($db->quoteName('state') . ' = -1');
-		$db->setQuery($query);
-		$discoveredExtensions = $db->loadObjectList();
-
-		return (count($discoveredExtensions) === 0) ? false : true;
-	}
 }