From: Zach Copley <zach@controlyourself.ca>
Date: Mon, 10 Aug 2009 07:49:51 +0000 (+0000)
Subject: Merge branch 'twitter-oauth' into 0.8.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=17dcf1c3170bc905e3b0fdffc804d6f7229ac61b;p=quix0rs-gnu-social.git

Merge branch 'twitter-oauth' into 0.8.x

Conflicts:

	scripts/getvaliddaemons.php
---

17dcf1c3170bc905e3b0fdffc804d6f7229ac61b
diff --cc scripts/getvaliddaemons.php
index 8b127bd201,9a2b833293..f1d8d8116d
--- a/scripts/getvaliddaemons.php
+++ b/scripts/getvaliddaemons.php
@@@ -43,11 -43,8 +43,12 @@@ if(common_config('twitterbridge','enabl
      echo "twitterstatusfetcher.php ";
  }
  echo "ombqueuehandler.php ";
 -echo "twitterqueuehandler.php ";
 -echo "synctwitterfriends.php ";
 +if (common_config('twitter', 'enabled')) {
 +    echo "twitterqueuehandler.php ";
++    echo "synctwitterfriends.php ";
 +}
  echo "facebookqueuehandler.php ";
  echo "pingqueuehandler.php ";
 -echo "smsqueuehandler.php ";
 +if (common_config('sms', 'enabled')) {
 +    echo "smsqueuehandler.php ";
 +}