aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2011-09-08 23:02:22 +0200
committerAndreas Fischer <bantu@phpbb.com>2011-09-08 23:02:22 +0200
commit56bd8f27cdca2b2ba55a95307fc7dcfb83c17866 (patch)
tree75210234a59df7b1c273b19e18cd5303407634ed
parentb21cee731af7571bd138d28ee377ff8d2c02d1ef (diff)
parent34bc0427df6d9adf004ab447a1d3af3bc3ebea52 (diff)
downloadforums-56bd8f27cdca2b2ba55a95307fc7dcfb83c17866.tar
forums-56bd8f27cdca2b2ba55a95307fc7dcfb83c17866.tar.gz
forums-56bd8f27cdca2b2ba55a95307fc7dcfb83c17866.tar.bz2
forums-56bd8f27cdca2b2ba55a95307fc7dcfb83c17866.tar.xz
forums-56bd8f27cdca2b2ba55a95307fc7dcfb83c17866.zip
Merge remote-tracking branch 'igorw/ticket/10359' into develop
* igorw/ticket/10359: [ticket/10359] Fix phpbb_request regression in download/file.php
-rw-r--r--phpBB/download/file.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/download/file.php b/phpBB/download/file.php
index aa49fb8ab5..ec15d36e08 100644
--- a/phpBB/download/file.php
+++ b/phpBB/download/file.php
@@ -44,6 +44,7 @@ if (isset($_GET['avatar']))
require($phpbb_root_path . 'includes/constants.' . $phpEx);
require($phpbb_root_path . 'includes/functions.' . $phpEx);
require($phpbb_root_path . 'includes/functions_download' . '.' . $phpEx);
+ require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
$class_loader = new phpbb_class_loader($phpbb_root_path, '.' . $phpEx);
$class_loader->register();
@@ -53,6 +54,7 @@ if (isset($_GET['avatar']))
$cache = $cache_factory->get_service();
$class_loader->set_cache($cache->get_driver());
+ $request = new phpbb_request();
$db = new $sql_db();
// Connect to DB
@@ -62,6 +64,8 @@ if (isset($_GET['avatar']))
}
unset($dbpasswd);
+ request_var('', 0, false, false, $request);
+
// worst-case default
$browser = strtolower($request->header('User-Agent', 'msie 6.0'));