aboutsummaryrefslogtreecommitdiffstats
path: root/include/zot.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-01-11 14:53:14 -0800
committerfriendica <info@friendica.com>2013-01-11 14:53:14 -0800
commitfa642b36ff771d2a1d2b032fd92d29a799a3be6a (patch)
tree8417d6468dc6851fa117ea03ff86ccd2482a91a0 /include/zot.php
parentb3d1b8332f39259efe258a1d0ddb054dabf82823 (diff)
downloadvolse-hubzilla-fa642b36ff771d2a1d2b032fd92d29a799a3be6a.tar.gz
volse-hubzilla-fa642b36ff771d2a1d2b032fd92d29a799a3be6a.tar.bz2
volse-hubzilla-fa642b36ff771d2a1d2b032fd92d29a799a3be6a.zip
fix double-encoding
Diffstat (limited to 'include/zot.php')
-rw-r--r--include/zot.php20
1 files changed, 10 insertions, 10 deletions
diff --git a/include/zot.php b/include/zot.php
index 2752fc2e4..b1853ff25 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1008,21 +1008,21 @@ function import_directory_profile($hash,$profile) {
$arr = array();
$arr['xprof_hash'] = $hash;
- $arr['xprof_desc'] = (($profile['description']) ? htmlentities($profile['description'], ENT_COMPAT,'UTF-8') : '');
+ $arr['xprof_desc'] = (($profile['description']) ? htmlentities($profile['description'], ENT_COMPAT,'UTF-8',false) : '');
$arr['xprof_dob'] = datetime_convert('','',$profile['birthday'],'Y-m-d'); // !!!! check this for 0000 year
- $arr['xprof_gender'] = (($profile['gender']) ? htmlentities($profile['gender'], ENT_COMPAT,'UTF-8') : '');
- $arr['xprof_marital'] = (($profile['marital']) ? htmlentities($profile['marital'], ENT_COMPAT,'UTF-8') : '');
- $arr['xprof_sexual'] = (($profile['sexual']) ? htmlentities($profile['sexual'], ENT_COMPAT,'UTF-8') : '');
- $arr['xprof_locale'] = (($profile['locale']) ? htmlentities($profile['locale'], ENT_COMPAT,'UTF-8') : '');
- $arr['xprof_region'] = (($profile['region']) ? htmlentities($profile['region'], ENT_COMPAT,'UTF-8') : '');
- $arr['xprof_postcode'] = (($profile['postcode']) ? htmlentities($profile['postcode'], ENT_COMPAT,'UTF-8') : '');
- $arr['xprof_country'] = (($profile['country']) ? htmlentities($profile['country'], ENT_COMPAT,'UTF-8') : '');
+ $arr['xprof_gender'] = (($profile['gender']) ? htmlentities($profile['gender'], ENT_COMPAT,'UTF-8',false) : '');
+ $arr['xprof_marital'] = (($profile['marital']) ? htmlentities($profile['marital'], ENT_COMPAT,'UTF-8',false) : '');
+ $arr['xprof_sexual'] = (($profile['sexual']) ? htmlentities($profile['sexual'], ENT_COMPAT,'UTF-8',false) : '');
+ $arr['xprof_locale'] = (($profile['locale']) ? htmlentities($profile['locale'], ENT_COMPAT,'UTF-8',false) : '');
+ $arr['xprof_region'] = (($profile['region']) ? htmlentities($profile['region'], ENT_COMPAT,'UTF-8',false) : '');
+ $arr['xprof_postcode'] = (($profile['postcode']) ? htmlentities($profile['postcode'], ENT_COMPAT,'UTF-8',false) : '');
+ $arr['xprof_country'] = (($profile['country']) ? htmlentities($profile['country'], ENT_COMPAT,'UTF-8',false) : '');
$clean = array();
if(array_key_exists('keywords',$profile) and is_array($profile['keywords'])) {
import_directory_keywords($hash,$profile['keywords']);
foreach($profile['keywords'] as $kw) {
- $kw = trim(htmlentities($kw,ENT_COMPAT,'UTF-8'));
+ $kw = trim(htmlentities($kw,ENT_COMPAT,'UTF-8',false));
}
$clean[] = $kw;
}
@@ -1092,7 +1092,7 @@ function import_directory_keywords($hash,$keywords) {
$clean = array();
foreach($keywords as $kw) {
- $kw = trim(htmlentities($kw,ENT_COMPAT,'UTF-8'));
+ $kw = trim(htmlentities($kw,ENT_COMPAT,'UTF-8',false));
$clean[] = $kw;
}