dojox.layout.ContentPane script tag match requires empty script tag or a src attribute

[guest]

Since [9850] the script regex will match:

<script> correct <script src='xxx'> correct <script type='text/javascript' src='xxx'> correct

and skips <script type='dojo/method' > correct and <script type='text/javascript'> incorrect

the following regex fixes the problem (I think).

<code>

<scripts*(?![^{>]*type=['"]?dojo)(?:[}>]*?(src=(['"]?)([^>]*?)1[>]*)?)?>([sS]*?)</script>

</code>

[guest]

F! a D!

try this:

<scripts*(?![^>]*type=['"]?dojo)(?:[^>]*?(src=(['"]?)([^>]*?)1[^>]*)?)?>([sS]*?)</script>

[guest]

BTW I have a CLA on file [email protected]…

[guest]

This will really do it as a drop in replacement for the pattern. (capture groups are the same as they used are in the existing source).

<scripts*(?![^>]*type=['"]?dojo)(?:[^>]*?(?:src=(['"]?)([^>]*?)1[^>]*)?)*>([sS]*?)</script>

[mumme]

(In [9965]) Make script match regex a bit smarter, didn't match type='text/javascript' correctly, added a test for that. Credits to reporter of ticket 3981, cpusoftware.com

Fixes #3981