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

Changing View::element() to not overwrite viewVars with helpers that

Browse source 
have the same name.
Test added.
Fixes #1354
This commit is contained in:
mark_story 2010-12-09 22:06:23 -05:00
parent 48f32a11e0
commit a830632071
3 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cake/libs/view/view.php
View file

@ -381,8 +381,13 @@ class View extends Object {
}
if (is_file($file)) {
$params = array_merge_recursive($params, $this->loaded);
$element = $this->_render($file, array_merge($this->viewVars, $params), $loadHelpers);
$vars = array_merge($this->viewVars, $params);
foreach ($this->loaded as $name => $helper) {
if (!isset($vars[$name])) {
$vars[$name] =& $this->loaded[$name];
}
}
$element = $this->_render($file, $vars, $loadHelpers);
if (isset($params['cache']) && isset($cacheFile) && isset($expires)) {
cache('views' . DS . $cacheFile, $element, $expires);
}

18
cake/tests/cases/libs/view/view.test.php
View file

@ -487,6 +487,24 @@ class ViewTest extends CakeTestCase {
$this->assertPattern('/non_existant_element/', $result);
}
/**
* test that additional element viewVars don't get overwritten with helpers.
*
* @return void
*/
function testElementParamsDontOverwriteHelpers() {
$Controller = new ViewPostsController();
$Controller->helpers = array('Form');
$View = new View($Controller);
$result = $View->element('type_check', array('form' => 'string'), true);
$this->assertEqual('string', $result);
$View->set('form', 'string');
$result = $View->element('type_check', array(), true);
$this->assertEqual('string', $result);
}
/**
* testElementCacheHelperNoCache method
*

1
cake/tests/test_app/views/elements/type_check.ctp Normal file
View file

@ -0,0 +1 @@
<?php echo gettype($form); ?>