& should not be part of URLs...

[core.git] / inc / classes / main / response / image / class_ImageResponse.php

diff --git a/inc/classes/main/response/image/class_ImageResponse.php b/inc/classes/main/response/image/class_ImageResponse.php
index 28c67f5f32b9e9346fd9cb02dc37ba7bdb92a8c8..bcf0c157829808186ae749094539a3487050bd9e 100644 (file)
--- a/inc/classes/main/response/image/class_ImageResponse.php
+++ b/inc/classes/main/response/image/class_ImageResponse.php
@@ -104,6 +104,8 @@ class ImageResponse extends BaseResponse implements Responseable {
 
                // Shall we encrypt the cookie?
                if ($encrypted === true) {
+                       // Unsupported at the moment
+                       $this->partialStub('Encryption is unsupported at the moment.');
                } // END - if
 
                // For slow browsers set the cookie array element first
@@ -164,7 +166,7 @@ class ImageResponse extends BaseResponse implements Responseable {
                } // END - if
 
                // Add redirect header
-               $this->addHeader('Location', $url);
+               $this->addHeader('Location', str_replace('&', '&', $url));
 
                // Set correct response status
                $this->setResponseStatus('301 Moved Permanently');
@@ -197,7 +199,7 @@ class ImageResponse extends BaseResponse implements Responseable {
                $this->setResponseBody($content);
 
                // Set content type
-               $this->addHeader('Content-type', "image/".$this->getImageInstance()->getImageType());
+               $this->addHeader('Content-type', 'image/' . $this->getImageInstance()->getImageType());
 
                // Call parent method
                parent::flushBuffer($force);