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

Fixing failing tests in JsHelper caused by changed API in HtmlHelper.

Browse source
This commit is contained in:
mark_story 2009-09-16 01:55:15 -04:00
parent dc013dadb1
commit 05f908d36d
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cake/libs/view/helpers/js.php
View file

@ -175,7 +175,9 @@ class JsHelper extends AppHelper {
$script = $this->{$this->__engineName}->domReady($script);
}
if (!$options['cache'] && $options['inline']) {
return $this->Html->scriptBlock($script, $options);
$opts = $options;
unset($opts['onDomReady'], $opts['cache'], $opts['clear']);
return $this->Html->scriptBlock($script, $opts);
}
if ($options['cache'] && $options['inline']) {
$filename = md5($script);
@ -247,7 +249,11 @@ class JsHelper extends AppHelper {
$event = $this->event('click', $requestString, $options);
}
if (isset($options['buffer']) && $options['buffer'] == false) {
$out .= $this->Html->scriptBlock($event, $options);
$opts = array();
if (isset($options['safe'])) {
$opts['safe'] = $options['safe'];
}
$out .= $this->Html->scriptBlock($event, $opts);
}
return $out;
}