diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-03-04 18:15:56 +0000 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-03-04 18:15:56 +0000 |
| commit | 014999758e2f4efa433a9c4e71d0551e0b5b318a (patch) | |
| tree | 8d15d1130c44849ddee8fcb9f6c9aa7603822b99 /kohana/core/utf8 | |
| parent | c0e65b202977c78c4562502373f630b8f835f1ff (diff) | |
Updated Kohana to r4033
Diffstat (limited to 'kohana/core/utf8')
| -rw-r--r-- | kohana/core/utf8/ord.php | 2 | ||||
| -rw-r--r-- | kohana/core/utf8/str_pad.php | 2 | ||||
| -rw-r--r-- | kohana/core/utf8/strcspn.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/kohana/core/utf8/ord.php b/kohana/core/utf8/ord.php index 29723b6b..76e31872 100644 --- a/kohana/core/utf8/ord.php +++ b/kohana/core/utf8/ord.php @@ -77,7 +77,7 @@ function _ord($chr) if ($ord0 >= 252 AND $ord0 <= 253) { - return ($ord0 - 252) * 1073741824 + ($ord1 - 128) * 16777216 + ($ord2 - 128) * 262144 + ($ord3 - 128) * 4096 + ($ord4 - 128) * 64 + (ord($c[5]) - 128); + return ($ord0 - 252) * 1073741824 + ($ord1 - 128) * 16777216 + ($ord2 - 128) * 262144 + ($ord3 - 128) * 4096 + ($ord4 - 128) * 64 + (ord($chr[5]) - 128); } if ($ord0 >= 254 AND $ord0 <= 255) diff --git a/kohana/core/utf8/str_pad.php b/kohana/core/utf8/str_pad.php index 63e27f0e..aab4ccc7 100644 --- a/kohana/core/utf8/str_pad.php +++ b/kohana/core/utf8/str_pad.php @@ -50,5 +50,5 @@ function _str_pad($str, $final_str_length, $pad_str = ' ', $pad_type = STR_PAD_R return $pad_left.$str.$pad_right; } - trigger_error('utf8::str_pad: Unknown padding type (' . $type . ')', E_USER_ERROR); + trigger_error('utf8::str_pad: Unknown padding type (' . $pad_type . ')', E_USER_ERROR); }
\ No newline at end of file diff --git a/kohana/core/utf8/strcspn.php b/kohana/core/utf8/strcspn.php index abd93d57..20d3e802 100644 --- a/kohana/core/utf8/strcspn.php +++ b/kohana/core/utf8/strcspn.php @@ -16,7 +16,7 @@ function _strcspn($str, $mask, $offset = NULL, $length = NULL) if (utf8::is_ascii($str) AND utf8::is_ascii($mask)) return ($offset === NULL) ? strcspn($str, $mask) : (($length === NULL) ? strcspn($str, $mask, $offset) : strcspn($str, $mask, $offset, $length)); - if ($start !== NULL OR $length !== NULL) + if ($str !== NULL OR $length !== NULL) { $str = utf8::substr($str, $offset, $length); } |