Merge branch 'feature/edit-profile-improvements' into develop

[friendica.git] / library / OAuth1.php

diff --git a/library/OAuth1.php b/library/OAuth1.php
old mode 100755 (executable)
new mode 100644 (file)
index 0db6fab..994962a
--- 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 {
@@ -421,8 +423,11 @@ class OAuthRequest {
   /**
    * builds the data one would send in a POST request
    */
-  public function to_postdata() {
-    return OAuthUtil::build_http_query($this->parameters);
+  public function to_postdata($raw = false) {
+    if ($raw)
+      return($this->parameters);
+    else
+      return OAuthUtil::build_http_query($this->parameters);
   }
 
   /**