Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/activity.php b/lib/activity.php
index 6acf37a8a..ae65fe36f 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -463,7 +463,7 @@ class ActivityUtils
                 $text = $contentEl->textContent;
                 return htmlspecialchars_decode($text, ENT_QUOTES);
             } else if ($type == 'xhtml') {
-                $divEl = ActivityUtils::child($contentEl, 'div');
+                $divEl = ActivityUtils::child($contentEl, 'div', 'http://www.w3.org/1999/xhtml');
                 if (empty($divEl)) {
                     return null;
                 }