summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2010-10-20 11:41:04 -0700
committerZach Copley <zach@status.net>2010-10-20 11:41:04 -0700
commit3d6a0f730d153378f47805bc6ea8a8d543eb9ab6 (patch)
tree52a1e0879e518490928513e5a09e7a999cf2b226 /classes
parent2760ef07f538da4116074ff7e2a04f799906a5bc (diff)
Revert DB change for OAuth. Change compound key for oauth_application_user
back to (profile_id, application_id). I think we can get away without a DB change by only issuing one anonymous access token per user.
Diffstat (limited to 'classes')
-rw-r--r--classes/Oauth_application_user.php2
-rw-r--r--classes/statusnet.ini3
2 files changed, 2 insertions, 3 deletions
diff --git a/classes/Oauth_application_user.php b/classes/Oauth_application_user.php
index fcf6553ff..e1b4b8c04 100644
--- a/classes/Oauth_application_user.php
+++ b/classes/Oauth_application_user.php
@@ -13,7 +13,7 @@ class Oauth_application_user extends Memcached_DataObject
public $profile_id; // int(4) primary_key not_null
public $application_id; // int(4) primary_key not_null
public $access_type; // tinyint(1)
- public $token; // varchar(255) primary_key not_null
+ public $token; // varchar(255)
public $created; // datetime not_null
public $modified; // timestamp not_null default_CURRENT_TIMESTAMP
diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index 7aa115fec..3fb8ee208 100644
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@ -393,14 +393,13 @@ name = U
profile_id = 129
application_id = 129
access_type = 17
-token = 130
+token = 2
created = 142
modified = 384
[oauth_application_user__keys]
profile_id = K
application_id = K
-token = K
[profile]
id = 129