Merge pull request #678 from fermionic/20130511-update-videojs

[friendica.git] / library / OAuth1.php

diff --git a/library/OAuth1.php b/library/OAuth1.php
index 3b211b146e79ec8f75e27a2f160ada974ef9c1d6..53b905e7714a5cbdc3d8effc40157d554958ddb5 100644 (file)
--- a/library/OAuth1.php
+++ b/library/OAuth1.php
@@ -3,8 +3,10 @@
 
 /* Generic exception class
  */
-class OAuthException extends Exception {
-  // pass
+if (!class_exists('OAuthException')) {
+       class OAuthException extends Exception {
+               // pass
+       }
 }
 
 class OAuthConsumer {
@@ -289,7 +291,7 @@ class OAuthRequest {
       }
 
     }
-    // fix for friendika redirect system
+    // fix for friendica redirect system
     
     $http_url =  substr($http_url, 0, strpos($http_url,$parameters['q'])+strlen($parameters['q']));
     unset( $parameters['q'] );