Merge remote-tracking branch 'upstream/master'

[quix0rs-gnu-social.git] / plugins / OStatus / lib / salmonqueuehandler.php

diff --git a/plugins/OStatus/lib/salmonqueuehandler.php b/plugins/OStatus/lib/salmonqueuehandler.php
index 56d3c9eff2e21a702e45787d30300da27292baa7..334dc14549c4fe101571fd4c0a30d4904ec1958b 100644 (file)
--- a/plugins/OStatus/lib/salmonqueuehandler.php
+++ b/plugins/OStatus/lib/salmonqueuehandler.php
@@ -17,6 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
 /**
  * Send a Salmon notification in the background.
  * @package OStatusPlugin
@@ -35,10 +39,9 @@ class SalmonQueueHandler extends QueueHandler
         assert(is_string($data['salmonuri']));
         assert(is_string($data['entry']));
 
-        $actor = Profile::staticGet($data['actor']);
+        $actor = Profile::getKV($data['actor']);
 
-        $salmon = new Salmon();
-        $salmon->post($data['salmonuri'], $data['entry'], $actor);
+        Salmon::post($data['salmonuri'], $data['entry'], $actor->getUser());
 
         // @fixme detect failure and attempt to resend
         return true;