Two bug fixes in activityimporter

diff --git a/lib/activityimporter.php b/lib/activityimporter.php
index 28c371e4dc5239d42d909eb16fbb7a75aacbd413..4a767813285dff30bdb744a9e1a47a035e92dd72 100644 (file)
--- a/lib/activityimporter.php
+++ b/lib/activityimporter.php
@@ -189,6 +189,8 @@ class ActivityImporter extends QueueHandler
                                                         " it's got a different author %s."),
                                                       $sourceUri, $uri));
                 }
+            } else {
+                throw new ClientException("Not overwriting author info for non-trusted user.");
             }
         }
 
@@ -338,8 +340,11 @@ class ActivityImporter extends QueueHandler
 
     function purify($content)
     {
+        require_once INSTALLDIR.'/extlib/htmLawed/htmLawed.php';
+
         $config = array('safe' => 1,
                         'deny_attribute' => 'id,style,on*');
+
         return htmLawed($content, $config);
     }
 }