Add JComponentHelper::isInstalled()

joomla · Sep 26, 2014 · 932b872 · 932b872
1 parent 8184494
commit 932b872
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 2 deletions.
diff --git a/administrator/modules/mod_stats_admin/helper.php b/administrator/modules/mod_stats_admin/helper.php
@@ -112,7 +112,7 @@ public static function getStats(&$params)
 				$i++;
 			}
 
-			if (JComponentHelper::isEnabled('com_weblinks'))
+			if (JComponentHelper::isInstalled('com_weblinks'))
 			{
 				$query->clear()
 					->select('COUNT(id) AS count_links')

diff --git a/libraries/cms/component/helper.php b/libraries/cms/component/helper.php
@@ -77,6 +77,27 @@ public static function isEnabled($option)
 		return $result->enabled;
 	}
 
+	/**
+	 * Checks if a component is installed
+	 *
+	 * @param   string  $option  The component option.
+	 *
+	 * @return  integer
+	 *
+	 * @since   3.4
+	 */
+	public static function isInstalled($option)
+	{
+		$db = JFactory::getDbo();
+
+		return (int) $db->setQuery(
+			$db->getQuery(true)
+				->select('COUNT(extension_id)')
+				->from('#__extensions')
+				->where('element = ' . $db->quote($option))
+		)->loadResult();
+	}
+
 	/**
 	 * Gets the parameter object for the component
 	 *

diff --git a/modules/mod_stats/helper.php b/modules/mod_stats/helper.php
@@ -102,7 +102,7 @@ public static function &getList(&$params)
 				$i++;
 			}
 
-			if (JComponentHelper::isEnabled('com_weblinks'))
+			if (JComponentHelper::isInstalled('com_weblinks'))
 			{
 				$query->clear()
 					->select('COUNT(id) AS count_links')

diff --git a/tests/unit/suites/libraries/cms/component/JComponentHelperTest.php b/tests/unit/suites/libraries/cms/component/JComponentHelperTest.php
@@ -49,6 +49,7 @@ public function testGetComponent()
 			'com_content is extension ID 22'
 		);
 	}
+
 	/**
 	 * Test JComponentHelper::isEnabled
 	 *
@@ -63,6 +64,27 @@ public function testIsEnabled()
 			'com_content should be enabled'
 		);
 	}
+
+	/**
+	 * Test JComponentHelper::isInstalled
+	 *
+	 * @return  void
+	 *
+	 * @since   3.4
+	 */
+	public function testIsInstalled()
+	{
+		$this->assertTrue(
+			(bool) JComponentHelper::isInstalled('com_content'),
+			'com_content should be installed'
+		);
+
+		$this->assertFalse(
+			(bool) JComponentHelper::isInstalled('com_willneverhappen'),
+			'com_willneverhappen should not be enabled'
+		);
+	}
+
 	/**
 	 * Test JComponentHelper::getParams
 	 *