From fcf89208cfcd9c65879d71ae2af69c7bd693a8e6 Mon Sep 17 00:00:00 2001 From: rxu Date: Mon, 27 May 2024 23:39:44 +0700 Subject: [PATCH 1/4] [ticket/17324] Add template event to notification_dropdown.html PHPBB3-17324 --- phpBB/docs/events.md | 14 ++++++++++++++ .../prosilver/template/notification_dropdown.html | 2 ++ 2 files changed, 16 insertions(+) diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index d05cb876fd..fb8f9b1b19 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -1597,6 +1597,20 @@ navbar_header_username_prepend * Since: 3.1.0-RC1 * Purpose: Add text and HTMl before the username shown in the navbar. +notification_dropdown_footer_after +=== +* Locations: + + styles/prosilver/template/notification_dropdown.html +* Since: 3.3.12 +* Purpose: Add content after notifications list footer. + +notification_dropdown_footer_before +=== +* Locations: + + styles/prosilver/template/notification_dropdown.html +* Since: 3.3.12 +* Purpose: Add content before notifications list footer. + overall_footer_after === * Locations: diff --git a/phpBB/styles/prosilver/template/notification_dropdown.html b/phpBB/styles/prosilver/template/notification_dropdown.html index e444d8fb90..281e5c9a8f 100644 --- a/phpBB/styles/prosilver/template/notification_dropdown.html +++ b/phpBB/styles/prosilver/template/notification_dropdown.html @@ -40,8 +40,10 @@ + {% EVENT notification_dropdown_footer_before %}
{L_SEE_ALL}
+ {% EVENT notification_dropdown_footer_after %} From a88040df85c6c0f91568c25df6e7cd03ebb4cda5 Mon Sep 17 00:00:00 2001 From: rxu Date: Tue, 28 May 2024 07:21:11 +0700 Subject: [PATCH 2/4] [ticket/17324] Adjust target version PHPBB3-17324 --- phpBB/docs/events.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index fb8f9b1b19..3e72be3e41 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -1601,14 +1601,14 @@ notification_dropdown_footer_after === * Locations: + styles/prosilver/template/notification_dropdown.html -* Since: 3.3.12 +* Since: prep-release-3.3.12 * Purpose: Add content after notifications list footer. notification_dropdown_footer_before === * Locations: + styles/prosilver/template/notification_dropdown.html -* Since: 3.3.12 +* Since: prep-release-3.3.12 * Purpose: Add content before notifications list footer. overall_footer_after From 9ea4aabe9a3a43f785decfab0e5ba926faa1f4f7 Mon Sep 17 00:00:00 2001 From: rxu Date: Tue, 28 May 2024 21:15:31 +0700 Subject: [PATCH 3/4] [ticket/17324] Allow targeting events to prep-releases PHPBB3-17324 --- phpBB/docs/events.md | 4 ++-- phpBB/phpbb/event/md_exporter.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 3e72be3e41..d8606c7e4c 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -1601,14 +1601,14 @@ notification_dropdown_footer_after === * Locations: + styles/prosilver/template/notification_dropdown.html -* Since: prep-release-3.3.12 +* Since: 3.3.12-prep-release * Purpose: Add content after notifications list footer. notification_dropdown_footer_before === * Locations: + styles/prosilver/template/notification_dropdown.html -* Since: prep-release-3.3.12 +* Since: 3.3.12-prep-release * Purpose: Add content before notifications list footer. overall_footer_after diff --git a/phpBB/phpbb/event/md_exporter.php b/phpBB/phpbb/event/md_exporter.php index 1a16a17413..7182ce697f 100644 --- a/phpBB/phpbb/event/md_exporter.php +++ b/phpBB/phpbb/event/md_exporter.php @@ -489,7 +489,7 @@ class md_exporter */ public function validate_version($version) { - return preg_match('#^\d+\.\d+\.\d+(?:-(?:a|b|RC|pl)\d+)?$#', $version); + return preg_match('#^\d+\.\d+\.\d+(?:-(?:a|b|RC|pl)\d+|(?:-prep-release))?$#', $version); } /** From 51da43f77fab61e07d0e04520e6190571d268320 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 29 May 2024 21:53:11 +0200 Subject: [PATCH 4/4] [prep-release-3.3.12] Fix since version and undo md exporter change --- phpBB/docs/events.md | 4 ++-- phpBB/phpbb/event/md_exporter.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index d8606c7e4c..fb8f9b1b19 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -1601,14 +1601,14 @@ notification_dropdown_footer_after === * Locations: + styles/prosilver/template/notification_dropdown.html -* Since: 3.3.12-prep-release +* Since: 3.3.12 * Purpose: Add content after notifications list footer. notification_dropdown_footer_before === * Locations: + styles/prosilver/template/notification_dropdown.html -* Since: 3.3.12-prep-release +* Since: 3.3.12 * Purpose: Add content before notifications list footer. overall_footer_after diff --git a/phpBB/phpbb/event/md_exporter.php b/phpBB/phpbb/event/md_exporter.php index 7182ce697f..1a16a17413 100644 --- a/phpBB/phpbb/event/md_exporter.php +++ b/phpBB/phpbb/event/md_exporter.php @@ -489,7 +489,7 @@ class md_exporter */ public function validate_version($version) { - return preg_match('#^\d+\.\d+\.\d+(?:-(?:a|b|RC|pl)\d+|(?:-prep-release))?$#', $version); + return preg_match('#^\d+\.\d+\.\d+(?:-(?:a|b|RC|pl)\d+)?$#', $version); } /**