Merge branch 'testing' into 0.9.x

1 files changed, 3 insertions, 7 deletions

diff --git a/lib/activity.php b/lib/activity.php
index ae65fe36f..d84eabf7c 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -1083,15 +1083,11 @@ class Activity
 
         $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) {
-            common_log(
-                LOG_WARNING,
-                'Activity::__construct() - '
-                . 'DOMDocument passed in for feed by mistake. '
-                . "Expecting a 'feed' DOMElement."
+            throw new ClientException(
+                _("Expecting a root feed element but got a whole XML document.")
             );
-            $feed = $feed->getElementsByTagName('feed')->item(0);
         }
 
         $this->feed  = $feed;