Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10038] Use request_var() in the avatar code path of download/file.php

Conflicts:
	phpBB/download/file.php
This commit is contained in:
Igor Wiedler 2011-02-12 19:55:23 +01:00
commit 8f0e9aee5c

View file

@ -74,7 +74,7 @@ if (isset($_GET['avatar']))
set_config(null, null, null, $config);
set_config_count(null, null, null, $config);
$filename = $_GET['avatar'];
$filename = request_var('avatar', '');
$avatar_group = false;
$exit = false;