diff options
author | Brion Vibber <brion@pobox.com> | 2010-02-21 18:56:41 -0800 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-02-21 18:56:41 -0800 |
commit | 3c61f45de1226b22eeb83bd1f6db01984f953737 (patch) | |
tree | ffb7bf7cb134b5072a409bd10331eacfb11dd44b /lib | |
parent | d3996996e483bc8ee1b4c9a38bc3ad17baabb8c0 (diff) | |
parent | f6ebe815382a61574df5f9452ee9a0ea4ae38f0c (diff) |
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'lib')
-rw-r--r-- | lib/omb.php | 8 |
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() |