From 3edd88eee84886fc6ba3e1fc25beda3c424370bc Mon Sep 17 00:00:00 2001
From: tubalmartin <tubalmartin@gmail.com>
Date: Sat, 3 Mar 2012 22:10:34 +0100
Subject: An even better url_title helper. Tests: http://codepad.org/tuJgvkyN
 Changelog entry added for 2.1.1

---
 system/helpers/url_helper.php | 27 +++++++--------------------
 1 file changed, 7 insertions(+), 20 deletions(-)

(limited to 'system/helpers/url_helper.php')

diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php
index 9f4b85248..cdb6dae9c 100644
--- a/system/helpers/url_helper.php
+++ b/system/helpers/url_helper.php
@@ -478,27 +478,14 @@ if ( ! function_exists('url_title'))
 {
 	function url_title($str, $separator = 'dash', $lowercase = FALSE)
 	{
-		if ($separator == 'dash')
-		{
-			$search		= '_';
-			$replace	= '-';
-		}
-		else
-		{
-			$search		= '-';
-			$replace	= '_';
-		}
+		$replace = $separator == 'dash' ? '-' : '_';
 
 		$trans = array(
-						'&\#\d+?;'				=> '',
-						'&\S+?;'				=> '',
-						'\s+'					=> $replace,
-						'[^a-z0-9\-\._]'		=> '',
-						$replace.'+'			=> $replace,
-						$replace.'$'			=> $replace,
-						'^'.$replace			=> $replace,
-						'\.+$'					=> ''
-					);
+			'&.+?;'			=> '',
+			'[^a-z0-9 _-]'	=> '',
+			'\s+'			=> $replace,
+			$replace.'+'	=> $replace
+		);
 
 		$str = strip_tags($str);
 
@@ -512,7 +499,7 @@ if ( ! function_exists('url_title'))
 			$str = strtolower($str);
 		}
 
-		return trim(stripslashes($str));
+		return trim($str, $replace);
 	}
 }
 
-- 
cgit v1.2.3-24-g4f1b