mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity

fixes iteration overriding argument name, caused bug where properties of another component where returned if cache was empty

Browse Source
This commit is contained in:
Łukasz Biały 2015-04-07 13:12:20 +02:00
parent 885dd70060
commit 4212386b37
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/cms/classes/CmsCompoundObject.php
View File

@ -329,10 +329,10 @@ class CmsCompoundObject extends CmsObject
/**
* Returns component property names and values.
* This method implements caching and can be used in the run-time on the front-end.
* @param string $componentName Specifies the component name.
* @param string $requestedComponentName Specifies the component name.
* @return array Returns an associative array with property names in the keys and property values in the values.
*/
public function getComponentProperties($componentName)
public function getComponentProperties($requestedComponentName)
{
$key = crc32($this->theme->getPath()).'component-properties';
@ -351,8 +351,8 @@ class CmsCompoundObject extends CmsObject
$objectCode = $this->getBaseFileName();
if (array_key_exists($objectCode, $objectComponentMap)) {
if (array_key_exists($componentName, $objectComponentMap[$objectCode])) {
return $objectComponentMap[$objectCode][$componentName];
if (array_key_exists($requestedComponentName, $objectComponentMap[$objectCode])) {
return $objectComponentMap[$objectCode][$requestedComponentName];
}
return [];
@ -387,8 +387,8 @@ class CmsCompoundObject extends CmsObject
Cache::put($key, serialize($objectComponentMap), Config::get('cms.parsedPageCacheTTL', 10));
if (array_key_exists($componentName, $objectComponentMap[$objectCode])) {
return $objectComponentMap[$objectCode][$componentName];
if (array_key_exists($requestedComponentName, $objectComponentMap[$objectCode])) {
return $objectComponentMap[$objectCode][$requestedComponentName];
}
return [];