summaryrefslogtreecommitdiff
path: root/lib/activity.php
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2010-03-03 20:55:53 -0800
committerZach Copley <zach@status.net>2010-03-03 20:58:34 -0800
commit8ffb34a90c78502843aabaac71963d2f40c505d8 (patch)
tree749138cabed3251919525649e41c81c37e23d3ff /lib/activity.php
parent0e360ad23da4404c47bdb074a1afdb2eed873ecd (diff)
Temp fix for problem getting actor from PuSH updates where actor is only specified in subject
Diffstat (limited to 'lib/activity.php')
-rw-r--r--lib/activity.php12
1 files changed, 12 insertions, 0 deletions
diff --git a/lib/activity.php b/lib/activity.php
index ce14fa254..e1bce6f19 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -1060,6 +1060,18 @@ class Activity
}
$this->entry = $entry;
+
+ // @fixme Don't send in a DOMDocument
+ if ($feed instanceof DOMDocument) {
+ common_log(
+ LOG_WARNING,
+ 'Activity::__construct() - '
+ . 'DOMDocument passed in for feed by mistake. '
+ . "Expecting a 'feed' DOMElement."
+ );
+ $feed = $feed->getElementsByTagName('feed')->item(0);
+ }
+
$this->feed = $feed;
$pubEl = $this->_child($entry, self::PUBLISHED, self::ATOM);