Merge pull request #36 from VSEphpbb/prep3.1.5

Update for use in a phpBB 3.1.5 release
phpbb-extensions · Jun 14, 2015 · 2dcbab9 · 2dcbab9
2 parents c639978 + 18c9079
commit 2dcbab9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/ext.php b/ext.php
@@ -21,7 +21,7 @@
 class ext extends \phpbb\extension\base
 {
 	/** @var string Require phpBB 3.1.5 due to the use of new template events */
-	const PHPBB_MIN_VERSION = '3.1.5-dev';
+	const PHPBB_MIN_VERSION = '3.1.5';
 
 	/**
 	 * Check whether or not the extension can be enabled.
@@ -33,6 +33,7 @@ class ext extends \phpbb\extension\base
 	 */
 	public function is_enableable()
 	{
-		return phpbb_version_compare(PHPBB_VERSION, self::PHPBB_MIN_VERSION, '>=');
+		$config = $this->container->get('config');
+		return phpbb_version_compare($config['version'], self::PHPBB_MIN_VERSION, '>=');
 	}
 }
diff --git a/tests/system/simple_test.php b/tests/system/simple_test.php
@@ -81,8 +81,6 @@ public function ext_test_data()
 	 */
 	public function test_ext($version, $expected)
 	{
-		$this->markTestSkipped('Skip this test until phpBB 3.1.5 is released');
-
 		// Instantiate config object and set config version
 		$config = new \phpbb\config\config(array(
 			'version' => $version,