diff options
author | Zach Copley <zach@controlyourself.ca> | 2009-09-08 16:02:57 -0700 |
---|---|---|
committer | Zach Copley <zach@controlyourself.ca> | 2009-09-08 16:02:57 -0700 |
commit | 9d87313eaebe8240393ac300a435f3b1332c8849 (patch) | |
tree | 6b7e7d69c63fc6801ad95477be9c11ccb7cd0a1a /lib/oauthstore.php | |
parent | 5efe588174c71979fc1970353c9a556ea441f138 (diff) | |
parent | beae3db41375879e725af053edf8041bbd76ac8c (diff) |
Merge branch '0.9.x' into pluginize-twitter-bridge
Conflicts:
plugins/TwitterBridge/twitterauthorization.php
Diffstat (limited to 'lib/oauthstore.php')
-rw-r--r-- | lib/oauthstore.php | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/oauthstore.php b/lib/oauthstore.php index 87d8cf213..e69a00f55 100644 --- a/lib/oauthstore.php +++ b/lib/oauthstore.php @@ -1,7 +1,7 @@ <?php /* - * Laconica - a distributed open-source microblogging tool - * Copyright (C) 2008, 2009, Control Yourself, Inc. + * StatusNet - the distributed open-source microblogging tool + * Copyright (C) 2008, 2009, StatusNet, Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -17,13 +17,11 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -if (!defined('LACONICA')) { - exit(1); -} +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } require_once 'libomb/datastore.php'; -class LaconicaDataStore extends OMB_Datastore +class StatusNetOAuthDataStore extends OAuthDataStore { // We keep a record of who's contacted us |