Unifying HTML stripping functions to common_strip_html

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

diff --git a/lib/activityobject.php b/lib/activityobject.php
index d0b929245e152e0ecd8a65d568ea39999f905a8b..7fe5c4850ca723105e4bfb82efb56d03450699f7 100644 (file)
--- a/lib/activityobject.php
+++ b/lib/activityobject.php
@@ -200,7 +200,7 @@ class ActivityObject
         $title = ActivityUtils::childHtmlContent($element, self::TITLE);
 
         if (!empty($title)) {
-            $this->title = html_entity_decode(strip_tags($title), ENT_QUOTES, 'UTF-8');
+            $this->title = common_strip_html($title);
         }
 
         // fall back to <atom:name>
@@ -251,10 +251,7 @@ class ActivityObject
         $this->content = ActivityUtils::getContent($element);
 
         // We don't like HTML in our titles, although it's technically allowed
-
-        $title = ActivityUtils::childHtmlContent($element, self::TITLE);
-
-        $this->title = html_entity_decode(strip_tags($title), ENT_QUOTES, 'UTF-8');
+        $this->title = common_strip_html(ActivityUtils::childHtmlContent($element, self::TITLE));
 
         $this->source  = $this->_getSource($element);