branch/3.1: merged bugfixes from trunk/ up to current

1 files changed, 4 insertions, 4 deletions

diff --git a/framework/Web/UI/WebControls/TOutputCache.php b/framework/Web/UI/WebControls/TOutputCache.php
index c0747a11..294519da 100644
--- a/framework/Web/UI/WebControls/TOutputCache.php
+++ b/framework/Web/UI/WebControls/TOutputCache.php
@@ -478,14 +478,14 @@ class TOutputCache extends TControl implements INamingContainer
 			$writer->write($this->_contents);

 		else if($this->_cacheAvailable)

 		{

-			$textWriter=new TTextWriter;

-

+			$htmlWriter = Prado::createComponent($this->GetResponse()->getHtmlWriterType(), new TTextWriter());

+			

 			$stack=$this->getPage()->getCachingStack();

 			$stack->push($this);

-			parent::render(new THtmlWriter($textWriter));

+			parent::render($htmlWriter);

 			$stack->pop();

 

-			$content=$textWriter->flush();

+			$content=$htmlWriter->flush();

 			$data=array($content,$this->_state,$this->_actions,time());

 			$this->_cache->set($this->getCacheKey(),$data,$this->getDuration(),$this->getCacheDependency());

 			$writer->write($content);