From 51da43f77fab61e07d0e04520e6190571d268320 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 29 May 2024 21:53:11 +0200 Subject: [PATCH] [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); } /**