summaryrefslogtreecommitdiff
path: root/lib/omb.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-02-21 21:57:32 -0500
committerEvan Prodromou <evan@status.net>2010-02-21 21:57:32 -0500
commit79c76f1a8725125d8b07fefa58485e800745c5ba (patch)
tree20ee05116ad104c0fd15d5456cb844741e33197d /lib/omb.php
parentbe70dd3677242fe46d41a0a8882abe6e46428b5f (diff)
parent3c61f45de1226b22eeb83bd1f6db01984f953737 (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'lib/omb.php')
-rw-r--r--lib/omb.php8
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/omb.php b/lib/omb.php
index 0f38a4936..17132a594 100644
--- a/lib/omb.php
+++ b/lib/omb.php
@@ -29,11 +29,9 @@ require_once 'Auth/Yadis/Yadis.php';
function omb_oauth_consumer()
{
- static $con = null;
- if (is_null($con)) {
- $con = new OAuthConsumer(common_root_url(), '');
- }
- return $con;
+ // Don't try to make this static. Leads to issues in
+ // multi-site setups - Z
+ return new OAuthConsumer(common_root_url(), '');
}
function omb_oauth_server()