diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-02-27 22:47:02 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-02-27 22:47:02 +0100 |
| commit | 8ec18b10c304610831e6a201034db9b6e63c7fce (patch) | |
| tree | d6d7e404bc357dfc0f6587d0ee376c2bd985535b /phpBB/phpbb/session.php | |
| parent | 5d6f86800fb81eb20a81db3252e174ba155f12cb (diff) | |
| parent | 18de60c0e099c2af41d853cfeb5799a09e0da630 (diff) | |
| download | forums-8ec18b10c304610831e6a201034db9b6e63c7fce.tar forums-8ec18b10c304610831e6a201034db9b6e63c7fce.tar.gz forums-8ec18b10c304610831e6a201034db9b6e63c7fce.tar.bz2 forums-8ec18b10c304610831e6a201034db9b6e63c7fce.tar.xz forums-8ec18b10c304610831e6a201034db9b6e63c7fce.zip | |
Merge branch '3.1.x'
Conflicts:
phpBB/phpbb/session.php
Diffstat (limited to 'phpBB/phpbb/session.php')
| -rw-r--r-- | phpBB/phpbb/session.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index 6aeb8a91de..d49f88b676 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -130,6 +130,10 @@ class session $script_path .= (substr($script_path, -1, 1) == '/') ? '' : '/'; $root_script_path .= (substr($root_script_path, -1, 1) == '/') ? '' : '/'; + $forum_id = $request->variable('f', 0); + // maximum forum id value is maximum value of mediumint unsigned column + $forum_id = ($forum_id > 0 && $forum_id < 16777215) ? $forum_id : 0; + $page_array += array( 'page_name' => $page_name, 'page_dir' => $page_dir, @@ -139,7 +143,7 @@ class session 'root_script_path' => str_replace(' ', '%20', htmlspecialchars($root_script_path)), 'page' => $page, - 'forum' => $request->variable('f', 0), + 'forum' => $forum_id, ); return $page_array; |