From cb53198bde1ea50c4ccfaa0436811de17e4dc107 Mon Sep 17 00:00:00 2001
From: llaffont <llaffont@afi-sa.fr>
Date: Tue, 2 Dec 2014 09:48:01 +0100
Subject: [PATCH] dev #17990 site webthumbnail: use ?url param instead of zf
style to prevent slash encoding problems on proxies
---
library/ZendAfi/View/Helper/WebThumbnail.php | 3 +--
tests/library/ZendAfi/View/Helper/WebThumbnailTest.php | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/library/ZendAfi/View/Helper/WebThumbnail.php b/library/ZendAfi/View/Helper/WebThumbnail.php
index d985599dea0..6713b5c8d53 100644
--- a/library/ZendAfi/View/Helper/WebThumbnail.php
+++ b/library/ZendAfi/View/Helper/WebThumbnail.php
@@ -36,8 +36,7 @@ class ZendAfi_View_Helper_WebThumbnail extends ZendAfi_View_Helper_BaseHelper {
if (!$this->getFileWriter()->fileExists($filepath)) {
return Class_AdminVar::isBlugaEnabled()
? $this->view->absoluteUrl(['controller' => 'sito',
- 'action' => 'webthumbnail',
- 'url' =>$url], null, true)
+ 'action' => 'webthumbnail'],null,true) . '?url=' . urlencode($url)
: '';
}
diff --git a/tests/library/ZendAfi/View/Helper/WebThumbnailTest.php b/tests/library/ZendAfi/View/Helper/WebThumbnailTest.php
index 7c525e02629..45fca09fefc 100644
--- a/tests/library/ZendAfi/View/Helper/WebThumbnailTest.php
+++ b/tests/library/ZendAfi/View/Helper/WebThumbnailTest.php
@@ -72,7 +72,7 @@ $this->google_thumbnail_path = USERFILESPATH.'/web_thumbnails/www_google_com.jpg
->answers(true);
$url = $this->helper->webThumbnail('http://www.google.com');
- $this->assertContains('/sito/webthumbnail/url/'.urlencode('http://www.google.com'),
+ $this->assertContains('/sito/webthumbnail?url='.urlencode('http://www.google.com'),
$url);
}
@@ -167,7 +167,7 @@ $this->google_thumbnail_path = USERFILESPATH.'/web_thumbnails/www_google_com.jpg
->answers(false);
$url = $this->helper->webThumbnail('http://www.google.com');
- $this->assertContains(BASE_URL.'/sito/webthumbnail/url/'.urlencode('http://www.google.com'), $url);
+ $this->assertContains(BASE_URL.'/sito/webthumbnail?url='.urlencode('http://www.google.com'), $url);
}
}
--
GitLab