Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[21935] branches/proposed/lib/tikilib.php

[Jonny B. <tw...@no...>]

+1

On 1 Oct 2009, at 14:54, Nyloth wrote:

> +1
>
> Nyloth
>
> 2009/10/1 <sy...@us...>
> Revision: 21935
>          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=21935&view=rev
> Author:   sylvieg
> Date:     2009-10-01 13:18:08 +0000 (Thu, 01 Oct 2009)
>
> Log Message:
> -----------
> [bp/ r 19927][FIX] to be able to have 2 ~~red:~~ on a same ligne +  
> mb_string for the snippet to avoid to cut the word in a multibyte -  
> a couple of page on doc.tw are broken
>
> Modified Paths:
> --------------
>    branches/proposed/lib/tikilib.php
>
> Modified: branches/proposed/lib/tikilib.php
> ===================================================================
> --- branches/proposed/lib/tikilib.php   2009-10-01 13:08:34 UTC (rev  
> 21934)
> +++ branches/proposed/lib/tikilib.php   2009-10-01 13:18:08 UTC (rev  
> 21935)
> @@ -6461,7 +6461,7 @@
>                if (!$simple_wiki) {
>                        // Replace colors  
> ~~foreground[,background]:text~~
>                        // must be done before []as the description  
> may contain color change
> -                       $data = preg_replace("/\~\~([^\:\,]+)(,([^\:] 
> +))?:(.*)\~\~/u", "<span style=\"color:$1; background:$3\">$4</ 
> span>", $data);
> +                       $data = preg_replace("/\~\~([^\:\,]+)(,([^\:] 
> +))?:(.*)\~\~/U", "<span style=\"color:$1; background:$3\">$4</ 
> span>", $data);
>                }
>                // This section matches [...].
>                // Added handling for [[foo] sections.  -rlpowell
> @@ -8368,7 +8368,10 @@
>                        $data = $this->parse_data($data,  
> array('is_html' => $is_html));
>                        $data = strip_tags($data);
>                }
> -               return substr($data, 0, $length);
> +               if (function_exists('mb_substr'))
> +                       return mb_substr($data, 0, $length);
> +               else
> +                       return substr($data, 0, $length);
>        }
>
>        function htmldecode($string, $quote_style = ENT_COMPAT,  
> $translation_table = HTML_ENTITIES) {
>
>
> This was sent by the SourceForge.net collaborative development  
> platform, the world's largest Open Source development site.
>
> ------------------------------------------------------------------------------
> Come build with us! The BlackBerry&reg; Developer Conference in SF, CA
> is the only developer event you need to attend this year. Jumpstart  
> your
> developing skills, take BlackBerry mobile applications to market and  
> stay
> ahead of the curve. Join us from November 9&#45;12, 2009. Register  
> now&#33;
> http://p.sf.net/sfu/devconf
> _______________________________________________
> Tikiwiki-cvs mailing list
> Tik...@li...
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs
>
> ------------------------------------------------------------------------------
> Come build with us! The BlackBerry&reg; Developer Conference in SF, CA
> is the only developer event you need to attend this year. Jumpstart  
> your
> developing skills, take BlackBerry mobile applications to market and  
> stay
> ahead of the curve. Join us from November 9&#45;12, 2009. Register  
> now&#33;
> http://p.sf.net/sfu/devconf_______________________________________________
> Tikiwiki-cvs mailing list
> Tik...@li...
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs