2 files changed, 46 insertions, 7 deletions
diff --git a/phpBB/phpbb/extension/manager.php b/phpBB/phpbb/extension/manager.php
index 52d9395c82..4a12e9ec8c 100644
--- a/phpBB/phpbb/extension/manager.php
+++ b/phpBB/phpbb/extension/manager.php
@@ -77,11 +77,12 @@ class manager
 	{
 		$this->extensions = array();
 
-		// Do not try to load any extensions when installing or updating
+		// Do not try to load any extensions if the extension table
+		// does not exist or when installing or updating.
 		// Note: database updater invokes this code, and in 3.0
 		// there is no extension table therefore the rest of this function
 		// fails
-		if (defined('IN_INSTALL'))
+		if (defined('IN_INSTALL') || version_compare($this->config['version'], '3.1.0-dev', '<'))
 		{
 			return;
 		}
@@ -423,7 +424,7 @@ class manager
 
 		foreach ($iterator as $file_info)
 		{
-			if ($file_info->isFile() && $file_info->getFilename() == 'ext.' . $this->php_ext)
+			if ($file_info->isFile() && $file_info->getFilename() == 'composer.json')
 			{
 				$ext_name = $iterator->getInnerIterator()->getSubPath();
 				$composer_file = $iterator->getPath() . '/composer.json';
@@ -515,7 +516,7 @@ class manager
 	* @param string $name Extension name to check NOTE: Can be user input
 	* @return bool Depending on whether or not the extension is available
 	*/
-	public function available($name)
+	public function is_available($name)
 	{
 		return file_exists($this->get_extension_path($name, true));
 	}
@@ -526,12 +527,50 @@ class manager
 	* @param string $name Extension name to check
 	* @return bool Depending on whether or not the extension is enabled
 	*/
-	public function enabled($name)
+	public function is_enabled($name)
 	{
 		return isset($this->extensions[$name]) && $this->extensions[$name]['ext_active'];
 	}
 
 	/**
+	* Check to see if a given extension is disabled
+	*
+	* @param string $name Extension name to check
+	* @return bool Depending on whether or not the extension is disabled
+	*/
+	public function is_disabled($name)
+	{
+		return isset($this->extensions[$name]) && !$this->extensions[$name]['ext_active'];
+	}
+
+	/**
+	* Check to see if a given extension is configured
+	*
+	* All enabled and disabled extensions are considered configured. A purged
+	* extension that is no longer in the database is not configured.
+	*
+	* @param string $name Extension name to check
+	* @return bool Depending on whether or not the extension is configured
+	*/
+	public function is_configured($name)
+	{
+		return isset($this->extensions[$name]);
+	}
+
+	/**
+	* Check to see if a given extension is purged
+	*
+	* An extension is purged if it is available, not enabled and not disabled.
+	*
+	* @param string $name Extension name to check
+	* @return bool Depending on whether or not the extension is purged
+	*/
+	public function is_purged($name)
+	{
+		return $this->is_available($name) && !$this->is_configured($name);
+	}
+
+	/**
 	* Instantiates a \phpbb\finder.
 	*
 	* @param bool $use_all_available Should we load all extensions, or just enabled ones
diff --git a/phpBB/phpbb/extension/metadata_manager.php b/phpBB/phpbb/extension/metadata_manager.php
index 014d8c79c7..1051021ea7 100644
--- a/phpBB/phpbb/extension/metadata_manager.php
+++ b/phpBB/phpbb/extension/metadata_manager.php
@@ -306,7 +306,7 @@ class metadata_manager
 	*/
 	public function validate_require_phpbb()
 	{
-		if (!isset($this->metadata['require']['phpbb/phpbb']))
+		if (!isset($this->metadata['extra']['soft-require']['phpbb/phpbb']))
 		{
 			return false;
 		}
@@ -369,7 +369,7 @@ class metadata_manager
 			'META_REQUIRE_PHP'		=> (isset($this->metadata['require']['php'])) ? htmlspecialchars($this->metadata['require']['php']) : '',
 			'META_REQUIRE_PHP_FAIL'	=> !$this->validate_require_php(),
 
-			'META_REQUIRE_PHPBB'		=> (isset($this->metadata['require']['phpbb/phpbb'])) ? htmlspecialchars($this->metadata['require']['phpbb/phpbb']) : '',
+			'META_REQUIRE_PHPBB'		=> (isset($this->metadata['extra']['soft-require']['phpbb/phpbb'])) ? htmlspecialchars($this->metadata['extra']['soft-require']['phpbb/phpbb']) : '',
 			'META_REQUIRE_PHPBB_FAIL'	=> !$this->validate_require_phpbb(),
 
 			'META_DISPLAY_NAME'	=> (isset($this->metadata['extra']['display-name'])) ? htmlspecialchars($this->metadata['extra']['display-name']) : '',