diff options
author | Brion Vibber <brion@pobox.com> | 2010-04-29 15:14:51 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-04-29 15:14:51 -0700 |
commit | 2260d6ec7c1f2b9c63196a4d8c6c99750a89eb10 (patch) | |
tree | cac824e9986caf03fd43bd967663ab1ef4b8bede /lib/activityutils.php | |
parent | 42348bc16711316918efef634d6d83bf19b0b1fe (diff) | |
parent | 50d5f5e04c9c37eb5ba20e1dbcd8ceb832d8be81 (diff) |
Merge branch 'testing' into 0.9.x
Conflicts:
index.php
Diffstat (limited to 'lib/activityutils.php')
-rw-r--r-- | lib/activityutils.php | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/activityutils.php b/lib/activityutils.php index a7e99fb11..401fd7fc2 100644 --- a/lib/activityutils.php +++ b/lib/activityutils.php @@ -213,11 +213,19 @@ class ActivityUtils // slavishly following http://atompub.org/rfc4287.html#rfc.section.4.1.3.3 if (empty($type) || $type == 'text') { - return $el->textContent; + // We have plaintext saved as the XML text content. + // Since we want HTML, we need to escape any special chars. + return htmlspecialchars($el->textContent); } else if ($type == 'html') { + // We have HTML saved as the XML text content. + // No additional processing required once we've got it. $text = $el->textContent; - return htmlspecialchars_decode($text, ENT_QUOTES); + return $text; } else if ($type == 'xhtml') { + // Per spec, the <content type="xhtml"> contains a single + // HTML <div> with XHTML namespace on it as a child node. + // We need to pull all of that <div>'s child nodes and + // serialize them back to an (X)HTML source fragment. $divEl = ActivityUtils::child($el, 'div', 'http://www.w3.org/1999/xhtml'); if (empty($divEl)) { return null; |