From 0892b27e326f14bd3f6229b55077ef5f9d5280b4 Mon Sep 17 00:00:00 2001
From: "ctrlaltca@gmail.com" <>
Date: Sat, 21 May 2011 18:14:36 +0000
Subject: branch/3.1: merged bugfixes from trunk/ up to current

---
 framework/Web/UI/WebControls/TOutputCache.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'framework/Web/UI/WebControls/TOutputCache.php')

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);
-- 
cgit v1.2.3