Merge branch 'master' into testing

[quix0rs-gnu-social.git] / lib / oauthstore.php

diff --git a/lib/oauthstore.php b/lib/oauthstore.php
index e34bf8a5ed8782d4430713caca155879447b3a56..eabe37f9fa4a944d76f99c91c9a57de69c6c0f23 100644 (file)
--- a/lib/oauthstore.php
+++ b/lib/oauthstore.php
@@ -65,7 +65,7 @@ class StatusNetOAuthDataStore extends OAuthDataStore
     {
         $n = new Nonce();
         $n->consumer_key = $consumer->key;
-        $n->ts = $timestamp;
+        $n->ts = common_sql_date($timestamp);
         $n->nonce = $nonce;
         if ($n->find(true)) {
             return true;
@@ -359,11 +359,9 @@ class StatusNetOAuthDataStore extends OAuthDataStore
         $notice = Notice::saveNew($author->id,
                                   $omb_notice->getContent(),
                                   'omb',
-                                  false,
-                                  null,
-                                  $omb_notice->getIdentifierURI());
+                                  array('is_local' => Notice::REMOTE_OMB,
+                                        'uri' => $omb_notice->getIdentifierURI()));
 
-        common_broadcast_notice($notice, true);
     }
 
     /**