Sigh... somehow left a stray bit of test code and broke activity.php.

diff --git a/lib/activity.php b/lib/activity.php
index d7e13052d464c32d9b389e070bef189760018613..4b724ee90e8192ab4c9d5bd03c50d32f280c055b 100644 (file)
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -462,7 +462,7 @@ class ActivityUtils
                 return htmlspecialchars($contentEl->textContent);
             } else if ($type == 'html') {
                 // The XML text decoding gives us an HTML string ready to roll.
-                return $contentEl->textContent, ENT_QUOTES;
+                return $contentEl->textContent;
             } else if ($type == 'xhtml') {
                 // Embedded XHTML; we have to pull it out of the document tree,
                 // then serialize it back out to an HTML fragment string.