Event fixes for activityhandlerplugin

diff --git a/classes/Notice.php b/classes/Notice.php
index 24a4c88d903d632d43139b34bdbe2987afecb9f7..1b2b631b04a23bfbe2da1ca491cdca13f6a31c5c 100644 (file)
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -913,7 +913,7 @@ class Notice extends Managed_DataObject
                 $object = null;
                 Event::handle('StoreActivityObject', array($act, $stored, $options, &$object));
                 if (empty($object)) {
-                    throw new ServerException('No object from StoreActivityObject '.$stored->uri . ': '.$act->asString());
+                    throw new ServerException('Unsuccessful call to StoreActivityObject '.$stored->uri . ': '.$act->asString());
                 }
                 $stored->object_type = ActivityUtils::resolveUri($object->getObjectType(), true);
                 $stored->update($orig);

diff --git a/lib/activityhandlerplugin.php b/lib/activityhandlerplugin.php
index f1ea953f44cbe8cb771443a3ccf8a2c8685c373a..19e4dc27b0fd7836477b8c3ae3a38c9fd74719ba 100644 (file)
--- a/lib/activityhandlerplugin.php
+++ b/lib/activityhandlerplugin.php
@@ -175,7 +175,7 @@ abstract class ActivityHandlerPlugin extends Plugin
      * This usually gets called from Notice::saveActivity after a Notice object has been created,
      * so it contains a proper id and a uri for the object to be saved.
      */
-    public function onStoreActivityObject(Activity $act, Notice $stored, array $options=array(), &$object) {
+    public function onStoreActivityObject(Activity $act, Notice $stored, array $options, &$object) {
         // $this->oldSaveNew is there during a migration period of plugins, to start using
         // Notice::saveActivity instead of Notice::saveNew
         if (!$this->isMyActivity($act) || isset($this->oldSaveNew)) {