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

[ticket/11997] Rename root_dirs_size to superordinate_dirs_count

Browse source 
This variable name better fits what is done with it. A comment explaining
why 2 has to be subtracted from the size of root_dirs has also been added

PHPBB3-11997
This commit is contained in:
Marc Alexander 2013-11-11 21:55:21 +01:00
parent 6bb9bce40e
commit 2d0fb4d166
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
phpBB/includes/functions.php
View file

@ -2712,9 +2712,17 @@ function redirect($url, $return = false, $disable_cd_check = false)
$root_dirs = array_diff_assoc($root_dirs, $intersection);
$page_dirs = array_diff_assoc($page_dirs, $intersection);
$root_dirs_size = sizeof($root_dirs) - 2;
$dir = (($root_dirs_size > 0) ? str_repeat('../', $root_dirs_size) : '') . implode('/', $page_dirs);
// Due to the dirname returned by pathinfo, the
// realpath for the $page_dirs array will be 2
// superordinate folders up from the phpBB root
// path even if the supplied path is in the
// phpBB root path. We need to subtract these 2
// folders in order to be able to correctly
// prepend '../' to the supplied path.
$superordinate_dirs_count = sizeof($root_dirs) - 2;
$dir = (($superordinate_dirs_count > 0) ? str_repeat('../', $superordinate_dirs_count) : '') . implode('/', $page_dirs);
// Strip / from the end
if ($dir && substr($dir, -1, 1) == '/')