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

Changing the checks surrounding dataExpression to use empty() instead of isset() so unexpected things don't happen if you ever use dataExpression = false. Fixes #1521

Browse source
This commit is contained in:
mark_story 2011-02-23 21:15:39 -05:00
parent 9367a10522
commit 139d6b3133
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cake/libs/view/helpers/jquery_engine.php
View file

@ -269,7 +269,7 @@ class JqueryEngineHelper extends JsBaseEngineHelper {
unset($options['update']); unset($options['update']);
} }
$callbacks = array('success', 'error', 'beforeSend', 'complete'); $callbacks = array('success', 'error', 'beforeSend', 'complete');
if (isset($options['dataExpression'])) { if (!empty($options['dataExpression'])) {
$callbacks[] = 'data'; $callbacks[] = 'data';
unset($options['dataExpression']); unset($options['dataExpression']);
} }

2
cake/libs/view/helpers/mootools_engine.php
View file

@ -252,7 +252,7 @@ class MootoolsEngineHelper extends JsBaseEngineHelper {
} }
$options['url'] = $url; $options['url'] = $url;
$options = $this->_prepareCallbacks('request', $options); $options = $this->_prepareCallbacks('request', $options);
if (isset($options['dataExpression'])) { if (!empty($options['dataExpression'])) {
$callbacks[] = 'data'; $callbacks[] = 'data';
unset($options['dataExpression']); unset($options['dataExpression']);
} elseif (!empty($data)) { } elseif (!empty($data)) {

2
cake/libs/view/helpers/prototype_engine.php
View file

@ -244,7 +244,7 @@ class PrototypeEngineHelper extends JsBaseEngineHelper {
} }
$safe = array_keys($this->_callbackArguments['request']); $safe = array_keys($this->_callbackArguments['request']);
$options = $this->_prepareCallbacks('request', $options, $safe); $options = $this->_prepareCallbacks('request', $options, $safe);
if (isset($options['dataExpression'])) { if (!empty($options['dataExpression'])) {
$safe[] = 'parameters'; $safe[] = 'parameters';
unset($options['dataExpression']); unset($options['dataExpression']);
} }