wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch order of html/text for StatusNet backwards compatibility

Browse Source 
StatusNet chooses the first content element in an Atom feed, while
it should really choose the 'html' representation for its 'rendered'
and 'text' representation for the (text-only) 'content'.

GNU social will implement a better algorithm for retrieving Atom
feeds, but that is yet to be done. So to avoid having link-less posts
on remote nodes, we'll just do the old switch-a-roo.

Other Atom readers, such as Mozilla Firefox, has the reverse priority
(choosing the last of the content elements).
This commit is contained in:
Mikael Nordfeldth 2013-10-20 12:50:27 +02:00
parent 0398741956
commit 802734d07e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/activityobject.php
View File

@ -698,13 +698,13 @@ class ActivityObject
// XXX: assuming HTML content here // XXX: assuming HTML content here
$xo->element( $xo->element(
ActivityUtils::CONTENT, ActivityUtils::CONTENT,
array('type' => 'text'), array('type' => 'html'),
html_entity_decode(strip_tags($this->content), ENT_QUOTES, 'UTF-8') common_xml_safe_str($this->content)
); );
$xo->element( $xo->element(
ActivityUtils::CONTENT, ActivityUtils::CONTENT,
array('type' => 'html'), array('type' => 'text'),
common_xml_safe_str($this->content) html_entity_decode(strip_tags($this->content), ENT_QUOTES, 'UTF-8')
); );
} }