diff options
| author | zotlabs <mike@macgirvin.com> | 2017-10-04 16:37:14 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-10-04 16:37:14 -0700 |
| commit | 80ca99fe5b9f7bb10ffae5789527b7a5d3c4f65e (patch) | |
| tree | c6a6f28f332943c6afb32cccfe68b5d9ec3c9aa1 | |
| parent | d6b1eff70ef579036f706fde6c2ecfd8152317cb (diff) | |
| download | volse-hubzilla-80ca99fe5b9f7bb10ffae5789527b7a5d3c4f65e.tar.gz volse-hubzilla-80ca99fe5b9f7bb10ffae5789527b7a5d3c4f65e.tar.bz2 volse-hubzilla-80ca99fe5b9f7bb10ffae5789527b7a5d3c4f65e.zip | |
wiki double encoding html entities
| -rw-r--r-- | Zotlabs/Lib/MarkdownSoap.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Render/Comanche.php | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Zotlabs/Lib/MarkdownSoap.php b/Zotlabs/Lib/MarkdownSoap.php index 534ad819f..fa279b07c 100644 --- a/Zotlabs/Lib/MarkdownSoap.php +++ b/Zotlabs/Lib/MarkdownSoap.php @@ -94,7 +94,7 @@ class MarkdownSoap { } function escape($s) { - return htmlspecialchars($s,ENT_QUOTES); + return htmlspecialchars($s,ENT_QUOTES,'UTF-8',false); } static public function unescape($s) { diff --git a/Zotlabs/Render/Comanche.php b/Zotlabs/Render/Comanche.php index beee9796e..d126cb3da 100644 --- a/Zotlabs/Render/Comanche.php +++ b/Zotlabs/Render/Comanche.php @@ -168,6 +168,8 @@ class Comanche { return $y['xchan_addr']; elseif($x[1] == 'name') return $y['xchan_name']; + elseif($x[1] == 'webname') + return substr($y['xchan_addr'],0,strpos($y['xchan_addr'],'@')); return false; } return get_observer_hash(); |