mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 03:54:10 +01:00
Code Issues Releases Wiki Activity

[ticket/11824] Revert changes in functions.php

Browse Source 
These will be added in another PR

PHPBB3-11824
This commit is contained in:
David King 2013-09-12 09:27:54 -07:00
parent 2f91fc9f6c
commit 310844fb7d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/includes/functions.php
View File

@ -5733,7 +5733,6 @@ function phpbb_create_symfony_request(phpbb_request $request)
*/
function phpbb_get_web_root_path(Request $symfony_request, $phpbb_root_path = '')
{
global $phpEx;
static $path;
if (null !== $path)
{
@ -5749,8 +5748,9 @@ function phpbb_get_web_root_path(Request $symfony_request, $phpbb_root_path = ''
$corrections = substr_count($path_info, '/');
// We need to account for whether or not app.php is in the URL
if (strpos($symfony_request->server->get('REQUEST_URI', ''), 'app.' . $phpEx . '/') === false)
// When URL Rewriting is enabled, app.php is optional. We have to
// correct for it not being there
if (strpos($symfony_request->getRequestUri(), $symfony_request->getScriptName()) === false)
{
$corrections -= 1;
}