merge from 1.7.3.5(r13153:r13167)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2013-09-29 23:32:39 +00:00
parent cc47d2b247
commit 2d3f149b5a
2042 changed files with 129266 additions and 126243 deletions

View file

@ -169,8 +169,8 @@ class TemplateHandlerTest extends PHPUnit_Framework_TestCase
),
// error case - ignore json
array(
'<script type="text/javascript">var json = {hello:"world"};</script>',
'<script type="text/javascript">var json = {hello:"world"};</script>'
'<script>var json = {hello:"world"};</script>',
'<script>var json = {hello:"world"};</script>'
),
// error case - inline javascript
array(