X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fomb.php;h=17132a594f6ec20ea2e079270d9a791895297f2a;hb=1aeca3947d7c938b9d14334d74f0fecd57a4eaf5;hp=e2a6d9f3f529f6004ef51c3846ad68a1b31143a6;hpb=42da45d3bc3cd0caa34f8d9f34c5617fedbb755e;p=quix0rs-gnu-social.git diff --git a/lib/omb.php b/lib/omb.php index e2a6d9f3f5..17132a594f 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() @@ -167,6 +165,7 @@ class StatusNet_OMB_Service_Consumer extends OMB_Service_Consumer { $this->datastore = omb_oauth_datastore(); $this->oauth_consumer = omb_oauth_consumer(); $this->fetcher = Auth_Yadis_Yadis::getHTTPFetcher(); + $this->fetcher->timeout = intval(common_config('omb', 'timeout')); } }