adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 09:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing a few issues within the new methods

Browse source
This commit is contained in:
Florian Krämer 2012-07-06 00:22:39 +02:00
parent ca9ff0283c
commit b2bb7bf2ae
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/Cake/View/View.php
View file

@ -394,7 +394,7 @@ class View extends Object {
} }
if (isset($options['cache'])) { if (isset($options['cache'])) {
$contents = $this->_elementCache($name, $plugin, $options); $contents = $this->_elementCache($name, $plugin, $data, $options);
if ($contents !== false) { if ($contents !== false) {
return $contents; return $contents;
} }
@ -1107,7 +1107,7 @@ class View extends Object {
* @param string $plugin Plugin name * @param string $plugin Plugin name
* @param array $options Element options * @param array $options Element options
*/ */
protected function _elementCache($name, $plugin, $options) { protected function _elementCache($name, $plugin, $data, $options) {
$underscored = null; $underscored = null;
if ($plugin) { if ($plugin) {
$underscored = Inflector::underscore($plugin); $underscored = Inflector::underscore($plugin);
@ -1124,8 +1124,8 @@ class View extends Object {
); );
$this->elementCacheSettings = array_merge($defaults, $options['cache']); $this->elementCacheSettings = array_merge($defaults, $options['cache']);
} }
$key = 'element_' . $this->elementCacheSettings['key']; $this->elementCacheSettings['key'] = 'element_' . $this->elementCacheSettings['key'];
return = Cache::read($key, $this->elementCacheSettings['config']); return Cache::read($this->elementCacheSettings['key'], $this->elementCacheSettings['config']);
} }
/** /**
@ -1140,7 +1140,7 @@ class View extends Object {
if (!$this->_helpersLoaded) { if (!$this->_helpersLoaded) {
$this->loadHelpers(); $this->loadHelpers();
} }
if ($callbacks) { if ($options['callbacks']) {
$this->getEventManager()->dispatch(new CakeEvent('View.beforeRender', $this, array($file))); $this->getEventManager()->dispatch(new CakeEvent('View.beforeRender', $this, array($file)));
} }
@ -1151,7 +1151,7 @@ class View extends Object {
$this->getEventManager()->dispatch(new CakeEvent('View.afterRender', $this, array($file, $element))); $this->getEventManager()->dispatch(new CakeEvent('View.afterRender', $this, array($file, $element)));
} }
if (isset($options['cache'])) { if (isset($options['cache'])) {
Cache::write($key, $element, $this->elementCacheSettings['config']); Cache::write($this->elementCacheSettings['key'], $element, $this->elementCacheSettings['config']);
} }
return $element; return $element;
} }