mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-01 14:30:32 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander
2022-04-15 23:48:31 +02:00
parent 75289bc28e 9739fabd68
commit 416718742a
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -35,9 +35,9 @@ phpBB's [Development Documentation](https://area51.phpbb.com/docs/dev/index.html
## 🔬 Automated Testing ## 🔬 Automated Testing
We have unit and functional tests in order to prevent regressions. You can view the bamboo continuous integration [here](https://bamboo.phpbb.com) or check our travis builds below: We have unit and functional tests in order to prevent regressions. You can view the bamboo continuous integration [here](https://bamboo.phpbb.com) or check our GitHub Actions below:
Branch | Description | Github Actions | Branch | Description | GitHub Actions |
------- | ----------- | -------------- | ------- | ----------- | -------------- |
**master** | Latest development version | ![Tests](https://github.com/phpbb/phpbb/workflows/Tests/badge.svg?branch=master) | **master** | Latest development version | ![Tests](https://github.com/phpbb/phpbb/workflows/Tests/badge.svg?branch=master) |
**3.3.x** | Development of version 3.3.x | ![Tests](https://github.com/phpbb/phpbb/workflows/Tests/badge.svg?branch=3.3.x) | **3.3.x** | Development of version 3.3.x | ![Tests](https://github.com/phpbb/phpbb/workflows/Tests/badge.svg?branch=3.3.x) |

5
phpBB/includes/functions.php
View File

@@ -3803,8 +3803,9 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
} }
} }
$forum_id = $request->variable('f', 0); // Negative forum and topic IDs are not allowed
$topic_id = $request->variable('t', 0); $forum_id = max(0, $request->variable('f', 0));
$topic_id = max(0, $request->variable('t', 0));
$s_feed_news = false; $s_feed_news = false;