summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrojaro <>2010-06-10 15:12:48 +0000
committerrojaro <>2010-06-10 15:12:48 +0000
commit73c065c6c25287beaeeffdc612c189e0cb5baaf2 (patch)
treefb499751507ebe6b5072841f086533000590ec1e
parent7bfa219a70920225c62fe32724ac0b126d354a53 (diff)
merged patches for #266
-rw-r--r--framework/TApplication.php2
-rw-r--r--framework/Web/UI/TCachePageStatePersister.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/framework/TApplication.php b/framework/TApplication.php
index 0a028141..679d5632 100644
--- a/framework/TApplication.php
+++ b/framework/TApplication.php
@@ -1676,7 +1676,7 @@ class TApplicationConfiguration extends TComponent
if(!isset($parameter['value'])) {
$this->_parameters[$id]=array('type'=>1, 'value' => $parameter, 'final' => $final);
} else {
- $this->_parameters[$id]=array('type'=>2, 'value' => $value, 'final' => $final);
+ $this->_parameters[$id]=array('type'=>2, 'value' => $parameter['value'], 'final' => $final);
}
}
}
diff --git a/framework/Web/UI/TCachePageStatePersister.php b/framework/Web/UI/TCachePageStatePersister.php
index 742bd687..a9637e87 100644
--- a/framework/Web/UI/TCachePageStatePersister.php
+++ b/framework/Web/UI/TCachePageStatePersister.php
@@ -111,7 +111,7 @@ class TCachePageStatePersister extends TComponent implements IPageStatePersister
$cache=Prado::getApplication()->getCache();
if($cache===null || !($cache instanceof ICache))
{
- if($this->_cacheModule!=='')
+ if($this->_cacheModuleID!=='')
throw new TConfigurationException('cachepagestatepersister_cachemoduleid_invalid',$this->_cacheModuleID);
else
throw new TConfigurationException('cachepagestatepersister_cache_required');