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

Throw an exception if we receive a document instead of a feed's root element

Browse Source
This commit is contained in:
Zach Copley 2010-03-15 19:06:06 -07:00
parent d1ea448c27
commit b994d529f4
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/activity.php
View File

@ -1083,15 +1083,11 @@ class Activity
$this->entry = $entry; $this->entry = $entry;
// @fixme Don't send in a DOMDocument // Insist on a feed's root DOMElement; don't allow a DOMDocument
if ($feed instanceof DOMDocument) { if ($feed instanceof DOMDocument) {
common_log( throw new ClientException(
LOG_WARNING, _("Expecting a root feed element but got a whole XML document.")
'Activity::__construct() - '
. 'DOMDocument passed in for feed by mistake. '
. "Expecting a 'feed' DOMElement."
); );
$feed = $feed->getElementsByTagName('feed')->item(0);
} }
$this->feed = $feed; $this->feed = $feed;