Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions adm/style/consentmanager_acp.html
Original file line number Diff line number Diff line change
Expand Up @@ -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') },
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"extra": {
"display-name": "Consent Manager",
"soft-require": {
"phpbb/phpbb": ">=3.3.0"
"phpbb/phpbb": ">=3.3.5"
}
}
}
4 changes: 2 additions & 2 deletions ext.php
Original file line number Diff line number Diff line change
Expand Up @@ -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', '>=');
}

/**
Expand Down
2 changes: 1 addition & 1 deletion language/en/install.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.',
]);
2 changes: 1 addition & 1 deletion migrations/m1_initial.php
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Loading