diff options
| author | Calvin Tam <calvintam236@gmail.com> | 2015-07-20 22:35:48 +0200 |
|---|---|---|
| committer | Calvin Tam <calvintam236@gmail.com> | 2015-07-20 22:35:48 +0200 |
| commit | f5311f105f6e708d89d9c92c4104dd911cf8be26 (patch) | |
| tree | 271a431c9464250d15a880ede0b17cfb2d111e7f /system/helpers/url_helper.php | |
| parent | 3e1286b00d0bdd37e649fdb706cd7dfddc25447d (diff) | |
| parent | 4b9fec6797db2aea3af8ca4080be73e2ff421080 (diff) | |
Merge branch 'develop' of https://github.com/bcit-ci/CodeIgniter into develop
Diffstat (limited to 'system/helpers/url_helper.php')
| -rw-r--r-- | system/helpers/url_helper.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php index 6a033d6ba..d65f92f1b 100644 --- a/system/helpers/url_helper.php +++ b/system/helpers/url_helper.php @@ -492,7 +492,7 @@ if ( ! function_exists('url_title')) $trans = array( '&.+?;' => '', - '[^a-z0-9 _-]' => '', + '[^\w\d _-]' => '', '\s+' => $separator, '('.$q_separator.')+' => $separator ); @@ -500,7 +500,7 @@ if ( ! function_exists('url_title')) $str = strip_tags($str); foreach ($trans as $key => $val) { - $str = preg_replace('#'.$key.'#i', $val, $str); + $str = preg_replace('#'.$key.'#i'.(UTF8_ENABLED ? 'u' : ''), $val, $str); } if ($lowercase === TRUE) |