summaryrefslogtreecommitdiff
path: root/lib/omb.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-12-02 11:07:57 -0500
committerEvan Prodromou <evan@status.net>2009-12-02 11:07:57 -0500
commit4205d25d226ed7bfd42ff13035ea208aa3cb1ce6 (patch)
tree1d2cc44421a2aff3414d3951033cfd159782b10c /lib/omb.php
parentba4fd15abd2978439118ed167cbaa4973548b68c (diff)
parent14eeef4ac49e5f8c49446c1ac20654d6300ce00b (diff)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'lib/omb.php')
-rw-r--r--lib/omb.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/omb.php b/lib/omb.php
index e2a6d9f3f..0f38a4936 100644
--- 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'));
}
}