aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHabeas Codice <habeascodice@federated.social>2015-01-18 18:41:11 -0800
committerHabeas Codice <habeascodice@federated.social>2015-01-18 18:41:11 -0800
commit7420896693589f1a4a5e91cef5c13852599464fd (patch)
tree2dea18bd7f974c77b9d0238493bc08f3ed901d70
parentaeed498752c7d91517433ef9fe369ff67c3b4069 (diff)
downloadvolse-hubzilla-7420896693589f1a4a5e91cef5c13852599464fd.tar.gz
volse-hubzilla-7420896693589f1a4a5e91cef5c13852599464fd.tar.bz2
volse-hubzilla-7420896693589f1a4a5e91cef5c13852599464fd.zip
allow system-loaded (i.e. pecl-oauth) to coexist
-rw-r--r--library/twitteroauth.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/library/twitteroauth.php b/library/twitteroauth.php
index 009ad56bd..a40949534 100644
--- a/library/twitteroauth.php
+++ b/library/twitteroauth.php
@@ -7,7 +7,8 @@
*/
/* Load OAuth lib. You can find it at http://oauth.net */
-require_once('library/OAuth1.php');
+if(!class_exists('OAuthException'))
+ require_once('library/OAuth1.php');
/**
* Twitter OAuth class