Merge remote-tracking branch 'upstream/nightly' into nightly

[quix0rs-gnu-social.git] / lib / activityutils.php

diff --git a/lib/activityutils.php b/lib/activityutils.php
index 94cf8544b1a476c247f5ca955ee70617965680c7..4f31648ead7bd275e48f04635be8f121e80b3889 100644 (file)
--- a/lib/activityutils.php
+++ b/lib/activityutils.php
@@ -301,7 +301,7 @@ class ActivityUtils
         return false;
     }
 
-    static function getFeedAuthor($feedEl)
+    static function getFeedAuthor(DOMElement $feedEl)
     {
         // Try old and deprecated activity:subject
 
@@ -367,7 +367,6 @@ class ActivityUtils
     static function resolveUri($uri, $make_relative=false)
     {
         if (empty($uri)) {
-            common_debug(_ve(debug_backtrace()));
             throw new ServerException('No URI to resolve in ActivityUtils::resolveUri');
         }