GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Unifying HTML stripping functions to common_strip_html

Browse Source
This commit is contained in:
Mikael Nordfeldth
2014-07-14 13:52:23 +02:00
parent e0a10f775f
commit ae62b91940
9 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/activityobject.php
View File

@@ -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);