merge r9989 from trunk to branch 2.2

git-svn-id: http://piwigo.org/svn/branches/2.2@10006 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
mistic100
2011-04-03 08:57:41 +00:00
parent ce4017ba48
commit 2659784b20
+1 -1
View File
@@ -522,7 +522,7 @@ $template->assign(
'U_HELP' => get_root_url().'admin/popuphelp.php?page=user_list',
'F_ADD_ACTION' => $base_url,
'F_USERNAME' => @htmlentities($_GET['username']),
'F_USERNAME' => @htmlentities($_GET['username'], ENT_COMPAT, 'UTF-8'),
'F_FILTER_ACTION' => get_root_url().'admin.php'
));