summaryrefslogtreecommitdiff
path: root/lib/activity.php
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-03-04 07:00:45 -0800
committerBrion Vibber <brion@pobox.com>2010-03-04 07:00:45 -0800
commit62d5f1addb1b710a387f7732ace1dd33bd1b86c1 (patch)
treedf1d6d402dd057c330b0eb71b803d595c024d476 /lib/activity.php
parent0f1c6e239acbf2c024c3aae9819d891f02b05bfd (diff)
parent9f861e9d895325adbb2dc7f1d540a442be2c1b2f (diff)
Merge branch 'testing'
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 7334239ec..2cb80f9e1 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -1064,6 +1064,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);