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')

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


From f8f04ce990a46f1967cd58def4929c476f4595a5 Mon Sep 17 00:00:00 2001
From: Phil Sturgeon <email@philsturgeon.co.uk>
Date: Sun, 4 Mar 2012 14:21:12 +0000
Subject: Fixed conflicts.

---
 system/helpers/form_helper.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'system/helpers')

diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php
index bed2cb297..6efef2324 100644
--- a/system/helpers/form_helper.php
+++ b/system/helpers/form_helper.php
@@ -22,7 +22,6 @@
  * @license		http://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  * @link		http://codeigniter.com
  * @since		Version 1.0
- * @filesource
  */
 
 // ------------------------------------------------------------------------
@@ -72,8 +71,8 @@ if ( ! function_exists('form_open'))
 
 		$form = '<form action="'.$action.'"'._attributes_to_string($attributes, TRUE).">\n";
 
-		// Add CSRF field if enabled, but leave it out for GET requests and requests to external websites
-		if ($CI->config->item('csrf_protection') === TRUE AND ! (strpos($action, $CI->config->site_url()) === FALSE OR strpos($form, 'method="get"')))
+		// Add CSRF field if enabled, but leave it out for GET requests and requests to external websites	
+		if ($CI->config->item('csrf_protection') === TRUE AND ! (strpos($action, $CI->config->base_url()) === FALSE OR strpos($form, 'method="get"')))	
 		{
 			$hidden[$CI->security->get_csrf_token_name()] = $CI->security->get_csrf_hash();
 		}
-- 
cgit v1.2.3-24-g4f1b


From 1a6971030718e2e92e6fc80750f7a14faf035257 Mon Sep 17 00:00:00 2001
From: tubalmartin <tubalmartin@gmail.com>
Date: Sun, 4 Mar 2012 16:01:11 +0100
Subject: Allow developers to use any string as a separator, not just dashes or
 underscores. Backwards compatible when using 'dash' or 'underscore' as string
 separator.

Tests: http://codepad.org/DWcxVH5r
---
 system/helpers/url_helper.php | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

(limited to 'system/helpers')

diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php
index cdb6dae9c..f1e8c6ac6 100644
--- a/system/helpers/url_helper.php
+++ b/system/helpers/url_helper.php
@@ -466,25 +466,34 @@ if ( ! function_exists('prep_url'))
  * Create URL Title
  *
  * Takes a "title" string as input and creates a
- * human-friendly URL string with either a dash
- * or an underscore as the word separator.
+ * human-friendly URL string with a "separator" string 
+ * as the word separator.
  *
  * @access	public
  * @param	string	the string
- * @param	string	the separator: dash, or underscore
+ * @param	string	the separator
  * @return	string
  */
 if ( ! function_exists('url_title'))
 {
-	function url_title($str, $separator = 'dash', $lowercase = FALSE)
+	function url_title($str, $separator = '-', $lowercase = FALSE)
 	{
-		$replace = $separator == 'dash' ? '-' : '_';
+		if ($separator == 'dash') 
+		{
+		    $separator = '-';
+		}
+		else if ($separator == 'underscore')
+		{
+		    $separator = '_';
+		}
+		
+		$q_separator = preg_quote($separator);
 
 		$trans = array(
-			'&.+?;'			=> '',
-			'[^a-z0-9 _-]'	=> '',
-			'\s+'			=> $replace,
-			$replace.'+'	=> $replace
+			'&.+?;'                 => '',
+			'[^a-z0-9 _-]'          => '',
+			'\s+'                   => $separator,
+			'('.$q_separator.')+'   => $separator
 		);
 
 		$str = strip_tags($str);
@@ -499,7 +508,7 @@ if ( ! function_exists('url_title'))
 			$str = strtolower($str);
 		}
 
-		return trim($str, $replace);
+		return trim($str, $separator);
 	}
 }
 
-- 
cgit v1.2.3-24-g4f1b