Merge branch 'master' of gitorious.org:statusnet/mainline

[quix0rs-gnu-social.git] / lib / activityobject.php

diff --git a/lib/activityobject.php b/lib/activityobject.php
index 52733c47a010d5dc489425c7989424e54eb7abd9..e89c8db4e9afee4e611a0e54d41ac150b9d14fc5 100644 (file)
--- a/lib/activityobject.php
+++ b/lib/activityobject.php
@@ -201,7 +201,7 @@ class ActivityObject
 
         $title = ActivityUtils::childHtmlContent($element, self::TITLE);
 
-        $this->title = html_entity_decode(strip_tags($title));
+        $this->title = html_entity_decode(strip_tags($title), ENT_QUOTES, 'UTF-8');
 
         $this->source  = $this->_getSource($element);