diff options
| author | Craig Andrews <candrews@integralblue.com> | 2010-02-16 10:25:57 -0500 |
|---|---|---|
| committer | Craig Andrews <candrews@integralblue.com> | 2010-02-16 10:25:57 -0500 |
| commit | 32084e33a266797b306158df29e48f057651b410 (patch) | |
| tree | 2a46e529783c8547aaae8ac00c8cac9bdfa61490 /lib/oauthstore.php | |
| parent | 057ec1fceacbfec1f755a5bc6700a188aa70e33f (diff) | |
| parent | d4f6235d7b8a40bd1b51370e7eb405cdb14e61fb (diff) | |
Merge branch '0.9.x' into 1.0.x
Conflicts:
lib/queuemanager.php
Diffstat (limited to 'lib/oauthstore.php')
| -rw-r--r-- | lib/oauthstore.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/oauthstore.php b/lib/oauthstore.php index b30fb49d5..eabe37f9f 100644 --- 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; @@ -362,7 +362,6 @@ class StatusNetOAuthDataStore extends OAuthDataStore array('is_local' => Notice::REMOTE_OMB, 'uri' => $omb_notice->getIdentifierURI())); - } /** |