makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-12 22:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.1.x'

Browse source 
Conflicts:
	phpBB/phpbb/session.php
This commit is contained in:
Joas Schilling 2015-02-27 22:47:02 +01:00
commit 8ec18b10c3
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/phpbb/session.php
View file

@ -130,6 +130,10 @@ class session
$script_path .= (substr($script_path, -1, 1) == '/') ? '' : '/'; $script_path .= (substr($script_path, -1, 1) == '/') ? '' : '/';
$root_script_path .= (substr($root_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_array += array(
'page_name' => $page_name, 'page_name' => $page_name,
'page_dir' => $page_dir, 'page_dir' => $page_dir,
@ -139,7 +143,7 @@ class session
'root_script_path' => str_replace(' ', '%20', htmlspecialchars($root_script_path)), 'root_script_path' => str_replace(' ', '%20', htmlspecialchars($root_script_path)),
'page' => $page, 'page' => $page,
'forum' => $request->variable('f', 0), 'forum' => $forum_id,
); );
return $page_array; return $page_array;