Changeset 1258 for trunk/system/helpers/text.php

Timestamp:

11/25/2007 04:09:46 AM (12 months ago)

Author:

Geert

Message:

Fixing bugs #236, #237 and #239.

Files:

• trunk/system/helpers/text.php (modified) (3 diffs)

trunk/system/helpers/text.php

@@ -23 +23 @@
          *  A word-limited string with the end character attached.
          */
-        public static function limit_words($str, $limit = 100, $end_char = '…')
+        public static function limit_words($str, $limit = 100, $end_char = NULL)
         {
                 $limit = (int) $limit;
+                $end_char = ($end_char === NULL) ? '…' : $end_char;
 
                 if (trim($str) == '')
@@ -141 +142 @@
 
                 $str = '';
-                $pool_size = utf8::strlen($pool);
+                $pool_size = (class_exists('utf8', FALSE)) ? utf8::strlen($pool) : strlen($pool);
 
                 for ($i = 0; $i < $length; $i++)
                 {
-                        $str .= utf8::substr($pool, mt_rand(0, $pool_size - 1), 1);
+                        $str .= (class_exists('utf8', FALSE)) ? utf8::substr($pool, mt_rand(0, $pool_size - 1), 1) : substr($pool, mt_rand(0, $pool_size - 1), 1);
                 }
 
@@ -196 +197 @@
                 $regex = '!'.$regex.'!ui';
 
-                if (utf8::strlen($replacement) == 1)
+                $strlen = (class_exists('utf8', FALSE)) ? utf8::strlen($replacement) : strlen($replacement);
+                if ($strlen == 1)
                 {
                         $regex .= 'e';
-                        return preg_replace($regex, 'str_repeat($replacement, utf8::strlen(\'$1\'))', $str);
+                        return preg_replace($regex, 'str_repeat($replacement, (class_exists(\'utf8\', FALSE)) ? utf8::strlen(\'$1\') : strlen(\'$1\'))', $str);
                 }