Merge pull request #21 from iMattPro/updates

Fix bugs

Author: iMattPro

adm/style/consentmanager_acp.html

@@ -42,8 +42,8 @@ <h3>{{ lang('WARNING') }}</h3>
 		<dl>
 			<dt><span>{{ lang('ACP_CONSENTMANAGER_REGISTRATIONS_EXPLAIN') }}</span></dt>
 			<dd>
-				{% if CONSENTMANAGER_SERVICES %}
-					{% set services = S_CONSENTMANAGER_MEDIA ? CONSENTMANAGER_SERVICES|merge([{'category': 'media', 'label': 'iframe bbcodes', 'id': 'phpbb.consentmanager'}]) : CONSENTMANAGER_SERVICES %}
+				{% set services = S_CONSENTMANAGER_MEDIA ? CONSENTMANAGER_SERVICES|merge([{'category': 'media', 'label': 'iframe bbcodes', 'id': 'phpbb.consentmanager'}]) : CONSENTMANAGER_SERVICES %}
+				{% if services %}
 					{% for category in [
 						{ id: 'necessary', label: lang('CONSENTMANAGER_CATEGORY_NECESSARY') },
 						{ id: 'analytics', label: lang('CONSENTMANAGER_CATEGORY_ANALYTICS') },

composer.json

@@ -23,7 +23,7 @@
 	"extra": {
 		"display-name": "Consent Manager",
 		"soft-require": {
-			"phpbb/phpbb": ">=3.3.0"
+			"phpbb/phpbb": ">=3.3.5"
 		}
 	}
 }

ext.php

@@ -33,13 +33,13 @@ public function is_enableable()
 	}
 
 	/**
-	 * Require phpBB 3.3.0
+	 * Require phpBB 3.3.5
 	 *
 	 * @return bool
 	 */
 	protected function check_phpbb_version()
 	{
-		return phpbb_version_compare(PHPBB_VERSION, '3.3.0', '>=');
+		return phpbb_version_compare(PHPBB_VERSION, '3.3.5', '>=');
 	}
 
 	/**

language/en/install.php

@@ -19,5 +19,5 @@
 }
 
 $lang = array_merge($lang, [
-	'CONSENTMANAGER_NOT_ENABLEABLE'	=> 'Consent Manager could not be enabled. The minimum requirements of phpBB 3.3.0 and/or PHP 7.2 were not satisfied.',
+	'CONSENTMANAGER_NOT_ENABLEABLE'	=> 'Consent Manager could not be enabled. The minimum requirements of phpBB 3.3.5 and/or PHP 7.2 were not satisfied.',
 ]);

migrations/m1_initial.php

@@ -19,7 +19,7 @@ public function effectively_installed()
 
 	public static function depends_on()
 	{
-		return ['\phpbb\db\migration\data\v33x\v3312rc1'];
+		return ['\phpbb\db\migration\data\v33x\v335'];
 	}
 
 	public function update_schema()