Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Prepare for 1.0.5 release.

  • Loading branch information...
commit be5f86766a802095934a43d59e1ef16107443a0b 1 parent 1bff887
qiang.xue authored
Showing with 10 additions and 7 deletions.
  1. +2 −2 CHANGELOG
  2. +1 −1  framework/YiiBase.php
  3. +7 −4 framework/yiilite.php
View
4 CHANGELOG
@@ -2,8 +2,8 @@
Yii Framework Change Log
========================
-Version 1.0.5 to be released
-----------------------------
+Version 1.0.5 May 10, 2009
+--------------------------
- Bug #234: Multi-line Yii::t() not found by 'yiic message' (Qiang)
- Bug #235: Dynamic content does not work when page caching is used together with fragment caching (Qiang)
- Bug #239: Syntax error in translated Portuguese error view file (Qiang)
View
2  framework/YiiBase.php
@@ -57,7 +57,7 @@ class YiiBase
*/
public static function getVersion()
{
- return '1.0.5-dev';
+ return '1.0.5';
}
/**
View
11 framework/yiilite.php
@@ -36,7 +36,7 @@ class YiiBase
private static $_logger;
public static function getVersion()
{
- return '1.0.5-dev';
+ return '1.0.5';
}
public static function createWebApplication($config=null)
{
@@ -2525,7 +2525,6 @@ class CController extends CBaseController
const STATE_INPUT_NAME='YII_PAGE_STATE';
public $layout;
public $defaultAction='index';
- public $usePageCaching=false;
private $_id;
private $_action;
private $_pageTitle;
@@ -2596,7 +2595,7 @@ public function processOutput($output)
{
Yii::app()->getClientScript()->render($output);
// if using page caching, we should delay dynamic output replacement
- if(!$this->usePageCaching && $this->_dynamicOutput)
+ if($this->_dynamicOutput!==null && $this->isCachingStackEmpty())
$output=$this->processDynamicOutput($output);
if($this->_pageStates===null)
$this->_pageStates=$this->loadPageStates();
@@ -2850,12 +2849,16 @@ public function recordCachingAction($context,$method,$params)
$cache->recordAction($context,$method,$params);
}
}
- public function getCachingStack()
+ public function getCachingStack($createIfNull=true)
{
if(!$this->_cachingStack)
$this->_cachingStack=new CStack;
return $this->_cachingStack;
}
+ public function isCachingStackEmpty()
+ {
+ return $this->_cachingStack===null || !$this->_cachingStack->getCount();
+ }
protected function beforeAction($action)
{
return true;
Please sign in to comment.
Something went wrong with that request. Please try again.