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

JavascriptHelper::blockEnd now correctly respects safe option. Test also added. Fixes #5074

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7330 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
joelmoss 2008-07-09 12:08:51 +00:00
parent 8d644172c9
commit aa1b0c776e
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -217,7 +217,7 @@ class JavascriptHelper extends AppHelper {
echo $this->__scriptBuffer; echo $this->__scriptBuffer;
$this->__scriptBuffer = null; $this->__scriptBuffer = null;
$options = $this->_blockOptions; $options = $this->_blockOptions;
$safe = (isset($options['safe']) || $this->safe); $safe = ((isset($options['safe']) && $options['safe']) || $this->safe);
$this->_blockOptions = array(); $this->_blockOptions = array();
$this->inBlock = false; $this->inBlock = false;

3
cake/tests/cases/libs/view/helpers/javascript.test.php
View file

@ -418,6 +418,9 @@ class JavascriptTest extends UnitTestCase {
$this->assertPattern('/^<script[^<>]+type="text\/javascript"[^<>]*>/', $result); $this->assertPattern('/^<script[^<>]+type="text\/javascript"[^<>]*>/', $result);
$this->assertNoPattern('/^<script[^type]=[^<>]*>/', $result); $this->assertNoPattern('/^<script[^type]=[^<>]*>/', $result);
$result = $this->Javascript->blockEnd();
$this->assertPattern('/^<\/script>$/', $result);
$result = $this->Javascript->codeBlock('something', array('safe' => true)); $result = $this->Javascript->codeBlock('something', array('safe' => true));
$this->assertPattern('/^<script[^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*something\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result); $this->assertPattern('/^<script[^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*something\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
$this->assertPattern('/^<script[^<>]+type="text\/javascript">\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*something\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result); $this->assertPattern('/^<script[^<>]+type="text\/javascript">\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*something\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);