[pLog-svn] r5092 - plog/branches/lifetype-1.2/class/data

[mark at devel.lifetype.net]

Author: mark
Date: 2007-03-15 02:27:30 -0400 (Thu, 15 Mar 2007)
New Revision: 5092

Modified:
   plog/branches/lifetype-1.2/class/data/textfilter.class.php
Log:
Danm... TortoiseMerge will destroy some UTF-8 code, commit the changes again.

Modified: plog/branches/lifetype-1.2/class/data/textfilter.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/data/textfilter.class.php	2007-03-15 05:54:57 UTC (rev 5091)
+++ plog/branches/lifetype-1.2/class/data/textfilter.class.php	2007-03-15 06:27:30 UTC (rev 5092)
@@ -415,7 +415,7 @@
          *
          * ; / ? : @ & = + $ ,
          *
-         * It will convert accented characters such as ? ? ? etc to their non-accented counterparts (a, e, i) And
+         * It will convert accented characters such as ˆ, , ’, etc to their non-accented counterparts (a, e, i) And
          * any other non-alphanumeric character that hasn't been removed or replaced will be thrown away.
          *
          * @param string The string that we wish to convert into something that can be used as a URL
@@ -429,8 +429,8 @@
             $string = str_replace(array(';','/','?',':','@','&','=','+','$',','), '', $string);
 
             // replace some characters to similar ones
-            $search  = array(' ', '?, '?, '?,'?,'?,'?,'?, '?, '?, '?,
-                             '?, '?, '?, '?, '?, '?, '?, '?, '? );
+            $search  = array(' ', 'ä', 'ö', 'ü','é','è','à','ç', 'à', 'è', 'ì',
+                             'ò', 'ù', 'á', 'é', 'í', 'ó', 'ú', 'ë', 'ï' );
             lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
 			$config =& Config::getConfig();
             $separator = $config->getValue( "urlize_word_separator", URLIZE_WORD_SEPARATOR_DEFAULT );
@@ -457,7 +457,7 @@
          *
          * ; / ? : @ & = + $ ,
          *
-         * It will convert accented characters such as ? ? ? etc to
+         * It will convert accented characters such as ˆ, , ’, etc to
          * their non-accented counterparts (a, e, i) And
          * any other non-alphanumeric character that hasn't been removed
          * or replaced will be thrown away.
@@ -480,7 +480,7 @@
             // replace some characters to similar ones
             // underscores aren't allowed in domain names according to rfc specs, and
             // cause trouble in some browsers, particularly with cookies.
-            $search  = array('-', '_',' ', '?,'?,'?,'?,'?,'?,'?,'?,'?,'?,'?,'?,'?,'?,'?,'?,'?,'?,'? );
+            $search  = array('-', '_',' ', 'ä','ö','ü','é','è','à','ç','à','è','ì','ò','ù','á','é','í','ó','ú','ë','ï' );
             $replace = array( $sep, $sep, $sep, 'a','o','u','e','e','a','c','a','e','i','o','u','a','e','i','o','u','e','i' );
             $string = str_replace($search, $replace, $string);