Ticket #236: TextHelperUTF8.patch

libs/kohana/helpers/text.php

@@ -140 +140 @@
                 }
 
                 $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);
                 }
 
                 return $str;
@@ -195 +195 @@
 
                 $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);
                 }
 
                 return preg_replace($regex, $replacement, $str);
@@ -247 +249 @@
                 return sprintf($format, $bytes / pow($mod, $power), $units[$power]);
         }
 
-} // End text
- No newline at end of file
+} // End text