X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fresponse%2Fimage%2Fclass_ImageResponse.php;h=649bddd82a70d6d663806866c44cb8667db233e6;hp=a496d3f49ef185eb150e4db11606564e2c06ad5f;hb=84e2207412d3c6ea9f940a83b2cdd4503509808a;hpb=73bb9000fb82cfb51d3e55f0d1f7f6d09974368e

diff --git a/inc/classes/main/response/image/class_ImageResponse.php b/inc/classes/main/response/image/class_ImageResponse.php
index a496d3f4..649bddd8 100644
--- a/inc/classes/main/response/image/class_ImageResponse.php
+++ b/inc/classes/main/response/image/class_ImageResponse.php
@@ -4,7 +4,7 @@
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009, 2010 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -25,11 +25,6 @@
  * Michal Cihar <michal@cihar.com>, licensed under GNU GPL 2.0.
  */
 class ImageResponse extends BaseResponse implements Responseable {
-	/**
-	 * Instance of the image
-	 */
-	private $imageInstance = null;
-
 	/**
 	 * Protected constructor
 	 *
@@ -71,7 +66,7 @@ class ImageResponse extends BaseResponse implements Responseable {
 		$cfg = $this->getConfigInstance();
 
 		// Set new template engine
-		$cfg->setConfigEntry('template_class'         , $cfg->getConfigEntry('image_template_class'));
+		$cfg->setConfigEntry('web_template_class'         , $cfg->getConfigEntry('image_template_class'));
 		$cfg->setConfigEntry('raw_template_extension' , '.img');
 		$cfg->setConfigEntry('code_template_extension', '.xml');
 		$cfg->setConfigEntry('tpl_base_path'          , 'templates/images/');
@@ -166,7 +161,7 @@ class ImageResponse extends BaseResponse implements Responseable {
 		} // END - if
 
 		// Add redirect header
-		$this->addHeader('Location', $url);
+		$this->addHeader('Location', str_replace('&amp;', '&', $url));
 
 		// Set correct response status
 		$this->setResponseStatus('301 Moved Permanently');
@@ -236,25 +231,6 @@ class ImageResponse extends BaseResponse implements Responseable {
 		} // END - if
 	}
 
-	/**
-	 * Setter for image instanxe
-	 *
-	 * @param	$imageInstance	An instance of an image
-	 * @return	void
-	 */
-	public final function setImageInstance (BaseImage $imageInstance) {
-		$this->imageInstance = $imageInstance;
-	}
-
-	/**
-	 * Getter for image instanxe
-	 *
-	 * @return	$imageInstance	An instance of an image
-	 */
-	public final function getImageInstance () {
-		return $this->imageInstance;
-	}
-
 	/**
 	 * Getter for default command
 	 *