diff options
| author | Nils Adermann <naderman@naderman.de> | 2015-02-25 16:25:20 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2015-02-25 16:25:20 +0100 |
| commit | d08d988df4731efa76ac897ece62af32e9c99c39 (patch) | |
| tree | e647dc48402a7c0dd539fc6ead02633967a2aee1 /phpBB/phpbb/session.php | |
| parent | 3ac583271f9d2557a1a89ab90e40f9baf6ed8b6d (diff) | |
| parent | 6f3f6282d192704854ae00a1aa1c0daaa68a307d (diff) | |
| download | forums-d08d988df4731efa76ac897ece62af32e9c99c39.tar forums-d08d988df4731efa76ac897ece62af32e9c99c39.tar.gz forums-d08d988df4731efa76ac897ece62af32e9c99c39.tar.bz2 forums-d08d988df4731efa76ac897ece62af32e9c99c39.tar.xz forums-d08d988df4731efa76ac897ece62af32e9c99c39.zip | |
Merge branch 'ticket/13617' into ticket/13617-ascraeus
* ticket/13617:
[ticket/13617] Enforce column size limit for session_forum_id
Conflicts:
phpBB/phpbb/session.php
Diffstat (limited to 'phpBB/phpbb/session.php')
| -rw-r--r-- | phpBB/phpbb/session.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index 0a6a18ffbe..0bbb869593 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -130,6 +130,9 @@ class session $script_path .= (substr($script_path, -1, 1) == '/') ? '' : '/'; $root_script_path .= (substr($root_script_path, -1, 1) == '/') ? '' : '/'; + $forum_id = request_var('f', 0); + $forum_id = ($forum_id > 0 && $forum_id < 16777215) ? $forum_id : 0; + $page_array += array( 'page_name' => $page_name, 'page_dir' => $page_dir, @@ -139,7 +142,7 @@ class session 'root_script_path' => str_replace(' ', '%20', htmlspecialchars($root_script_path)), 'page' => $page, - 'forum' => request_var('f', 0), + 'forum' => $forum_id, ); return $page_array; |