Enano CMS (1.1.x): comparison includes/functions.php

equal deleted inserted replaced

-:1bc7e849a264
+:91127e62f38f
 // Which tags to strip for JAVASCRIPT PROCESSING ONLY - you can change this if needed
 $strip_tags = Array('enano:no-opt');
 $strip_tags = implode('|', $strip_tags);
 // Strip out the tags and replace with placeholders
-preg_match_all("#<($strip_tags)(.*?)>(.*?)</($strip_tags)>#is", $html, $matches);
+preg_match_all("#<($strip_tags)([ ]+.*?)?>(.*?)</($strip_tags)>#is", $html, $matches);
 $seed = md5(microtime() . mt_rand()); // Random value used for placeholders
 for ($i = 0;$i < sizeof($matches[1]); $i++)
 {
 $html = str_replace($matches[0][$i], "{DONT_STRIP_ME_NAKED:$seed:$i}", $html);
 }
 // Optimize (but don't obfuscate) Javascript
-preg_match_all('/<script(.*?)>(.+?)<\/script>/is', $html, $jscript);
+preg_match_all('/<script([ ]+.*?)?>(.*?)<\/script>/is', $html, $jscript);
 // list of Javascript reserved words - from about.com
 $reserved_words = array('abstract', 'as', 'boolean', 'break', 'byte', 'case', 'catch', 'char', 'class', 'continue', 'const', 'debugger', 'default', 'delete', 'do',
 'double', 'else', 'enum', 'export', 'extends', 'false', 'final', 'finally', 'float', 'for', 'function', 'goto', 'if', 'implements', 'import',
 'in', 'instanceof', 'int', 'interface', 'is', 'long', 'namespace', 'native', 'new', 'null', 'package', 'private', 'protected', 'public',
 $reserved_words = '(' . implode('|', $reserved_words) . ')';
 for ( $i = 0; $i < count($jscript[0]); $i++ )
 {
 $js =& $jscript[2][$i];
+// echo('<pre>' . "-----------------------------------------------------------------------------\n" . htmlspecialchars($js) . '</pre>');
 // for line optimization, explode it
 $particles = explode("\n", $js);
 foreach ( $particles as $j => $atom )

changeset 183	91127e62f38f
parent 174	4c5c2b66a34d
child 184	d74ff822acc9