mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 06:08:52 +00:00
ENT_COMPAT is the default, with ENT_QUOTES a few features will no longer work.
git-svn-id: file:///svn/phpbb/trunk@6519 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
55e848eff8
commit
0de6e24865
3 changed files with 5 additions and 5 deletions
|
@ -24,7 +24,7 @@ function set_var(&$result, $var, $type, $multibyte = false)
|
|||
|
||||
if ($type == 'string')
|
||||
{
|
||||
$result = trim(htmlspecialchars(str_replace(array("\r\n", "\r"), array("\n", "\n"), $result), ENT_QUOTES, 'UTF-8'));
|
||||
$result = trim(htmlspecialchars(str_replace(array("\r\n", "\r"), array("\n", "\n"), $result), ENT_COMPAT, 'UTF-8'));
|
||||
|
||||
if (!empty($result))
|
||||
{
|
||||
|
|
|
@ -145,7 +145,7 @@ class ucp_profile
|
|||
|
||||
$messenger->assign_vars(array(
|
||||
'SITENAME' => $config['sitename'],
|
||||
'USERNAME' => html_entity_decode($username, ENT_QUOTES, 'UTF-8'),
|
||||
'USERNAME' => html_entity_decode($username, ENT_COMPAT, 'UTF-8'),
|
||||
'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']),
|
||||
|
||||
'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&u={$user->data['user_id']}&k=$user_actkey")
|
||||
|
@ -180,7 +180,7 @@ class ucp_profile
|
|||
$messenger->im($row['user_jabber'], $row['username']);
|
||||
|
||||
$messenger->assign_vars(array(
|
||||
'USERNAME' => html_entity_decode($username, ENT_QUOTES, 'UTF-8'),
|
||||
'USERNAME' => html_entity_decode($username, ENT_COMPAT, 'UTF-8'),
|
||||
'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']),
|
||||
|
||||
'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&u={$user->data['user_id']}&k=$user_actkey")
|
||||
|
|
|
@ -338,7 +338,7 @@ class ucp_register
|
|||
$messenger->assign_vars(array(
|
||||
'SITENAME' => $config['sitename'],
|
||||
'WELCOME_MSG' => sprintf($user->lang['WELCOME_SUBJECT'], $config['sitename']),
|
||||
'USERNAME' => html_entity_decode($username, ENT_QUOTES, 'UTF-8'),
|
||||
'USERNAME' => html_entity_decode($username, ENT_COMPAT, 'UTF-8'),
|
||||
'PASSWORD' => html_entity_decode($password_confirm),
|
||||
'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']),
|
||||
|
||||
|
@ -384,7 +384,7 @@ class ucp_register
|
|||
$messenger->im($row['user_jabber'], $row['username']);
|
||||
|
||||
$messenger->assign_vars(array(
|
||||
'USERNAME' => html_entity_decode($username, ENT_QUOTES, 'UTF-8'),
|
||||
'USERNAME' => html_entity_decode($username, ENT_COMPAT, 'UTF-8'),
|
||||
'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']),
|
||||
|
||||
'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&u=$user_id&k=$user_actkey")
|
||||
|
|
Loading…
Add table
Reference in a new issue