Project

General

Profile

« Previous | Next » 

Revision 740

Added by thorn over 16 years ago

fixed an issue with highlighting

View differences:

trunk/CHANGELOG
11 11
! = Update/Change
12 12

  
13 13
------------------------------------- 2.7.0 -------------------------------------
14
03-Mar-2008 Thomas Hornik
15
#	fixed an issue with highlighting
14 16
02-Mar-2008 Thomas Hornik
15 17
#	added missing text in language-files
16 18
+	added missing sorting to language dropdown in admin/pages/settings.php
trunk/wb/framework/frontend.functions.php
84 84
	// the highlighting
85 85
	// match $string, but not inside <style>...</style>, <script>...</script>, <!--...--> or HTML-Tags
86 86
	// split $string into pieces - "cut away" styles, scripts, comments, HTML-tags and eMail-addresses
87
	$matches = preg_split("/(<style.*<\/style>|<script.*<\/script>|<!--.*-->|<.*>|\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}\b)/iUs",$foo,-1,(PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY));
87
	// for HTML-Tags use <(?:[^<]|<.*>)*> which will match strings like <input ... value="<b>value</b>" >
88
	$matches = preg_split("/(<style.*<\/style>|<script.*<\/script>|<!--.*-->|<(?:[^<]|<.*>)*>|\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}\b)/iUs",$foo,-1,(PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY));
88 89
	if(is_array($matches) && $matches != array()) {
89 90
		$foo = "";
90 91
		$string = strtr($string, array('&lt;'=>'<', '&gt;'=>'>', '&amp;'=>'&', '&quot;'=>'"', '&#39;'=>'\'', '&nbsp;'=>"\xC2\xA0"));

Also available in: Unified diff