Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #13

Merged
merged 2 commits into from
Jan 4, 2024
Merged

Fixes #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12175b5
Recognize phpBB version 4 better
iMattPro Jan 4, 2024
20c5f6e
Improve phpBB4 compatibility warning message
iMattPro Jan 4, 2024
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
1 change: 1 addition & 0 deletions adm/style/event/acp_main_notice_after.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{% if S_WPN_COMPATIBILITY_NOTICE %}
<div class="errorbox">
<h3>{{ lang('ACP_WEBPUSH_REMOVE_WARNING') }}</h3>
<p>{{ lang('ACP_WEBPUSH_REMOVE_NOTICE') }}</p>
</div>
{% endif %}
2 changes: 1 addition & 1 deletion event/listener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,6 @@ public function load_language()
*/
public function compatibility_notice()
{
$this->template->assign_var('S_WPN_COMPATIBILITY_NOTICE', phpbb_version_compare(PHPBB_VERSION, '4.0.0-a1', '>='));
$this->template->assign_var('S_WPN_COMPATIBILITY_NOTICE', phpbb_version_compare(PHPBB_VERSION, '4.0.0-dev', '>='));
}
}
2 changes: 1 addition & 1 deletion ext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public function is_enableable()
protected function check_phpbb_version()
{
if (phpbb_version_compare(PHPBB_VERSION, '3.3.12-dev', '<') ||
phpbb_version_compare(PHPBB_VERSION, '4.0.0-a1', '>='))
phpbb_version_compare(PHPBB_VERSION, '4.0.0-dev', '>='))
{
$this->errors[] = 'PHPBB_VERSION_ERROR';
}
Expand Down
3 changes: 2 additions & 1 deletion language/en/info_acp_webpushnotifications.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@

$lang = array_merge($lang, [
'ACP_WEBPUSH_SETTINGS' => 'Web Push settings',
'ACP_WEBPUSH_REMOVE_NOTICE' => 'Web Push Notifications are now built-in to phpBB.<br>The extension “phpBB Browser Push Notifications” is no longer needed and should be uninstalled.<br>All settings and user preferences associated with the extension will be migrated into phpBB‘s built-in push notifications when you uninstall the extension.',
'ACP_WEBPUSH_REMOVE_WARNING' => 'Web Push Notifications are now built-in to phpBB',
'ACP_WEBPUSH_REMOVE_NOTICE' => 'The extension “phpBB Browser Push Notifications” is no longer needed and should be uninstalled.<br>All settings and user preferences associated with the extension will be migrated into phpBB‘s built-in push notifications when you uninstall the extension.',
'LOG_CONFIG_WEBPUSH' => '<strong>Altered Web Push settings</strong>',
'LOG_WEBPUSH_MESSAGE_FAIL' => '<strong>Web Push message could not be sent:</strong> %s',
'LOG_WEBPUSH_SUBSCRIPTION_REMOVED' => '<strong>Removed Web Push subscription:</strong>» %s',
Expand Down