Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing

[quix0rs-gnu-social.git] / lib / omb.php

diff --git a/lib/omb.php b/lib/omb.php
index e2a6d9f3f529f6004ef51c3846ad68a1b31143a6..0f38a49369fc34c8de680a0b5fe90236c65fe161 100644 (file)
--- a/lib/omb.php
+++ b/lib/omb.php
@@ -167,6 +167,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'));
     }
 
 }