Merge branch 'profile' into 'nightly'

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

diff --git a/plugins/OStatus/lib/salmon.php b/plugins/OStatus/lib/salmon.php
index cdc8e02d77af23be52f011738835f77b61477e91..b964538cbcb33e31c62689722904095f00c69756 100644 (file)
--- a/plugins/OStatus/lib/salmon.php
+++ b/plugins/OStatus/lib/salmon.php
@@ -43,18 +43,18 @@ class Salmon
      *
      * @param string $endpoint_uri
      * @param string $xml string representation of payload
-     * @param User $user local user profile whose keys we sign with
+     * @param Profile $user profile whose keys we sign with (must be a local user)
      * @return boolean success
      */
-    public static function post($endpoint_uri, $xml, User $user, Profile $target=null)
+    public static function post($endpoint_uri, $xml, Profile $actor, Profile $target=null)
     {
         if (empty($endpoint_uri)) {
-            common_debug('No endpoint URI for Salmon post to '.$user->getUri());
+            common_debug('No endpoint URI for Salmon post to '.$actor->getUri());
             return false;
         }
 
         try {
-            $magic_env = MagicEnvelope::signAsUser($xml, $user);
+            $magic_env = MagicEnvelope::signAsUser($xml, $actor->getUser());
         } catch (Exception $e) {
             common_log(LOG_ERR, "Salmon unable to sign: " . $e->getMessage());
             return false;