diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-10-22 13:46:55 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-10-22 13:46:55 +0000 |
| commit | 0de6e24865900ed968c9dabd3d7329a59e6be8b3 (patch) | |
| tree | 0e589907989825ca46335cccfa19932602136d7e | |
| parent | 55e848eff835f42b8c81bb122891f51ce372278f (diff) | |
| download | forums-0de6e24865900ed968c9dabd3d7329a59e6be8b3.tar forums-0de6e24865900ed968c9dabd3d7329a59e6be8b3.tar.gz forums-0de6e24865900ed968c9dabd3d7329a59e6be8b3.tar.bz2 forums-0de6e24865900ed968c9dabd3d7329a59e6be8b3.tar.xz forums-0de6e24865900ed968c9dabd3d7329a59e6be8b3.zip | |
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
| -rw-r--r-- | phpBB/includes/functions.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_register.php | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 671f20d398..939bcf2356 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -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)) { diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 516e57e8b3..b6a6d625d6 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -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") diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index 5489e89e0f..c1e507df29 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -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") |