From 3684d8e9711516264fedac0519262891d9894ea1 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Tue, 10 Sep 2013 10:13:26 -0500
Subject: [ticket/11832] Use $phpbb_filesystem instead of the container in
append_sid
PHPBB3-11832
---
phpBB/includes/functions.php | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
(limited to 'phpBB/includes')
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 124c0de169..45f0ae44da 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2409,7 +2409,7 @@ function phpbb_on_page($template, $user, $base_url, $num_items, $per_page, $star
*/
function append_sid($url, $params = false, $is_amp = true, $session_id = false)
{
- global $_SID, $_EXTRA_URL, $phpbb_hook;
+ global $_SID, $_EXTRA_URL, $phpbb_hook, $phpbb_filesystem;
global $phpbb_dispatcher;
global $symfony_request, $phpbb_root_path, $phpbb_container;
@@ -2420,8 +2420,10 @@ function append_sid($url, $params = false, $is_amp = true, $session_id = false)
}
// Update the root path with the correct relative web path
- $phpbb_filesystem = $phpbb_container->get('filesystem');
- $url = $phpbb_filesystem->update_web_root_path($url, $symfony_request);
+ if ($phpbb_filesystem instanceof phpbb_filesystem)
+ {
+ $url = $phpbb_filesystem->update_web_root_path($url, $symfony_request);
+ }
$append_sid_overwrite = false;
@@ -5719,6 +5721,6 @@ function phpbb_create_symfony_request(phpbb_request $request)
array_walk_recursive($get_parameters, $sanitizer);
array_walk_recursive($post_parameters, $sanitizer);
- $symfony_request = new Request($get_parameters, $post_parameters, array(), $cookie_parameters, $files_parameters, $server_parameters);
+ $symfony_request = new Symfony\Component\HttpFoundation\Request($get_parameters, $post_parameters, array(), $cookie_parameters, $files_parameters, $server_parameters);
return $symfony_request;
}
--
cgit v1.2.1