From 934f85be9521097a236d86744c0c9d81566732d0 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Wed, 27 May 2026 08:33:11 -0700 Subject: [PATCH 1/2] Iframes not showing as a service when there are no other services --- adm/style/consentmanager_acp.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adm/style/consentmanager_acp.html b/adm/style/consentmanager_acp.html index c4a937a..bd1cf72 100644 --- a/adm/style/consentmanager_acp.html +++ b/adm/style/consentmanager_acp.html @@ -42,8 +42,8 @@

{{ lang('WARNING') }}

{{ lang('ACP_CONSENTMANAGER_REGISTRATIONS_EXPLAIN') }}
- {% 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') }, From cc9343f154ccf2091f5a4a4d4add1c361911fdb1 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Wed, 27 May 2026 08:35:01 -0700 Subject: [PATCH 2/2] Bump version minimums --- composer.json | 2 +- ext.php | 4 ++-- language/en/install.php | 2 +- migrations/m1_initial.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index c64015a..edf0d0a 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "extra": { "display-name": "Consent Manager", "soft-require": { - "phpbb/phpbb": ">=3.3.0" + "phpbb/phpbb": ">=3.3.5" } } } diff --git a/ext.php b/ext.php index 2a18046..471a40c 100644 --- a/ext.php +++ b/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', '>='); } /** diff --git a/language/en/install.php b/language/en/install.php index 5f2b317..a34a654 100644 --- a/language/en/install.php +++ b/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.', ]); diff --git a/migrations/m1_initial.php b/migrations/m1_initial.php index 835dcb1..c4daff4 100644 --- a/migrations/m1_initial.php +++ b/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()