From 32bdf1c1e3c8ec6c0ccf38a947ff01c06eb9152f Mon Sep 17 00:00:00 2001 From: dimonneon Date: Fri, 10 Jul 2015 21:47:04 +0300 Subject: Add unicode support in url_title function --- system/helpers/url_helper.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php index 6a033d6ba..41ded94ee 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.'#ui', $val, $str); } if ($lowercase === TRUE) -- cgit v1.2.3-24-g4f1b From 28c830507780c65c9b79f55e63d1071327c41205 Mon Sep 17 00:00:00 2001 From: dimonneon Date: Mon, 13 Jul 2015 11:54:05 +0300 Subject: Add check for PCRE UTF-8 support --- system/helpers/url_helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php index 41ded94ee..d65f92f1b 100644 --- a/system/helpers/url_helper.php +++ b/system/helpers/url_helper.php @@ -500,7 +500,7 @@ if ( ! function_exists('url_title')) $str = strip_tags($str); foreach ($trans as $key => $val) { - $str = preg_replace('#'.$key.'#ui', $val, $str); + $str = preg_replace('#'.$key.'#i'.(UTF8_ENABLED ? 'u' : ''), $val, $str); } if ($lowercase === TRUE) -- cgit v1.2.3-24-g4f1b From 1dfc20da1d2f30f086f9489393141491ccfeed4c Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Wed, 15 Jul 2015 15:30:01 +0300 Subject: [ci skip] Changelog entry for PR #3970 --- user_guide_src/source/changelog.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 8457d8f65..d431d49ca 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -25,6 +25,9 @@ Release Date: Not Released - Added 'is_resource' to the available expectations in :doc:`Unit Testing Library `. +- Helpers + + - Added Unicode support to :doc:`URL Helper ` function :php:func:`url_title()`. Bug fixes for 3.0.1 ------------------- -- cgit v1.2.3-24-g4f1b