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

Split OStatusPlugin FeedSub receive into two parts

Browse Source 
FeedSub::receive now only handles the PuSH verification
FeedSub::receiveFeed is protected and only parses+imports feed XML
This commit is contained in:
Mikael Nordfeldth 2017-04-21 08:08:39 +02:00
parent e87115d462
commit f51cb6fca9
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/OStatus/classes/FeedSub.php
View File

@ -460,8 +460,15 @@ class FeedSub extends Managed_DataObject
return;
}
$this->receiveFeed($post);
}
protected function receiveFeed($feed_xml)
{
// We're passed the XML for the Atom feed as $feed_xml,
// so read it into a DOMDocument and process.
$feed = new DOMDocument();
if (!$feed->loadXML($post)) {
if (!$feed->loadXML($feed_xml)) {
// @fixme might help to include the err message
common_log(LOG_ERR, __METHOD__ . ": ignoring invalid XML");
return;