From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 10 Jan 2012 08:49:10 +0000 (+0400)
Subject: fix tmhOAuth missing query parameters (closes #416)
X-Git-Tag: 1.5.9~7
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=a3e0bdcffc757bd196de7e43bd9aa9cf8ca32626;p=tt-rss.git

fix tmhOAuth missing query parameters (closes #416)
---

diff --git a/include/functions.php b/include/functions.php
index 65019683..5ccbe8a5 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -5336,5 +5336,4 @@
 
 		}
 	}
-
 ?>
diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 84173f05..5502c9f5 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -172,7 +172,8 @@
 				'user_secret' => $access_token['oauth_token_secret'],
 			));
 
-			$code = $tmhOAuth->request('GET', $url);
+			$code = $tmhOAuth->request('GET', $url,
+				convertUrlQuery(parse_url($url, PHP_URL_QUERY)));
 
 			if ($code == 200) {
 
@@ -1375,4 +1376,23 @@
 		}
 	}
 
+	/**
+	* Source: http://www.php.net/manual/en/function.parse-url.php#104527
+	* Returns the url query as associative array
+	*
+	* @param    string    query
+	* @return    array    params
+	*/
+	function convertUrlQuery($query) {
+		$queryParts = explode('&', $query);
+
+		$params = array();
+
+		foreach ($queryParts as $param) {
+			$item = explode('=', $param);
+			$params[$item[0]] = $item[1];
+		}
+
+		return $params;
+	}
 ?>