Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

1 files changed, 9 insertions, 4 deletions

diff --git a/plugins/OStatus/lib/salmonaction.php b/plugins/OStatus/lib/salmonaction.php
index 8734223c6..273be588b 100644
--- a/plugins/OStatus/lib/salmonaction.php
+++ b/plugins/OStatus/lib/salmonaction.php
@@ -205,9 +205,14 @@ class SalmonAction extends Action
             $options['created'] = common_sql_time($this->act->time);
         }
 
-        return Notice::saveNew($oprofile->profile_id,
-                               $content,
-                               'ostatus+salmon',
-                               $options);
+        $saved = Notice::saveNew($oprofile->profile_id,
+                                 $content,
+                                 'ostatus+salmon',
+                                 $options);
+
+        // Record that this was saved through a validated Salmon source
+        // @fixme actually do the signature validation!
+        Ostatus_source::saveNew($saved, $oprofile, 'salmon');
+        return $saved;
     }
 }