Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrobocoder <anthon.pang@gmail.com>2010-02-25 17:10:10 +0300
committerrobocoder <anthon.pang@gmail.com>2010-02-25 17:10:10 +0300
commitc8a35bf02ea4baae4afbcab15ce91a281283addc (patch)
treeba08eb51535b4315fdf16e04fad533ea30b31836 /libs/Zend/Feed/Pubsubhubbub/Subscriber.php
parentad1a84e911b89f9506b4f4ca1829ef8055784459 (diff)
fixes #1175 - update to ZF 1.10.2
git-svn-id: http://dev.piwik.org/svn/trunk@1870 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'libs/Zend/Feed/Pubsubhubbub/Subscriber.php')
-rw-r--r--libs/Zend/Feed/Pubsubhubbub/Subscriber.php7
1 files changed, 3 insertions, 4 deletions
diff --git a/libs/Zend/Feed/Pubsubhubbub/Subscriber.php b/libs/Zend/Feed/Pubsubhubbub/Subscriber.php
index 4a19583a1d..35a4ccf96c 100644
--- a/libs/Zend/Feed/Pubsubhubbub/Subscriber.php
+++ b/libs/Zend/Feed/Pubsubhubbub/Subscriber.php
@@ -639,7 +639,6 @@ class Zend_Feed_Pubsubhubbub_Subscriber
$client->setUri($url);
$client->setRawData($this->_getRequestParameters($url, $mode));
$response = $client->request();
- echo $client->getLastRequest();
if ($response->getStatus() !== 204
&& $response->getStatus() !== 202
) {
@@ -721,7 +720,7 @@ class Zend_Feed_Pubsubhubbub_Subscriber
* Establish a persistent verify_token and attach key to callback
* URL's path/querystring
*/
- $key = $this->_generateSubscriptionKey($params);
+ $key = $this->_generateSubscriptionKey($params, $hubUrl);
$token = $this->_generateVerifyToken();
$params['hub.verify_token'] = $token;
@@ -791,9 +790,9 @@ class Zend_Feed_Pubsubhubbub_Subscriber
* @param string $hubUrl The Hub Server URL for which this token will apply
* @return string
*/
- protected function _generateSubscriptionKey(array $params)
+ protected function _generateSubscriptionKey(array $params, $hubUrl)
{
- $keyBase = $params['hub.topic'] . $params['hub.callback'];
+ $keyBase = $params['hub.topic'] . $hubUrl;
$key = md5($keyBase);
return $key;
}