summaryrefslogtreecommitdiffstats
path: root/system/helpers/url_helper.php
diff options
context:
space:
mode:
authorMichael Dennis <michaeljdennis@gmail.com>2011-08-29 19:06:59 +0200
committerMichael Dennis <michaeljdennis@gmail.com>2011-08-29 19:06:59 +0200
commit013f78dc6a878d7775aa2bbcef573934a6d88a72 (patch)
tree97ba05fd8e5efc066cb8f428744991fc628d207b /system/helpers/url_helper.php
parentcb07a322bee5c5b0a551ab959c7475a1a702ad03 (diff)
parent70e61b5dc0b240c4a3341ca65ad9f2f5254df1b5 (diff)
Merge remote-tracking branch 'upstream/develop' into develop
Diffstat (limited to 'system/helpers/url_helper.php')
-rwxr-xr-x[-rw-r--r--]system/helpers/url_helper.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php
index 9f4b85248..c524dddd1 100644..100755
--- a/system/helpers/url_helper.php
+++ b/system/helpers/url_helper.php
@@ -512,7 +512,7 @@ if ( ! function_exists('url_title'))
$str = strtolower($str);
}
- return trim(stripslashes($str));
+ return trim(trim(stripslashes($str)), $replace);
}
}
@@ -527,7 +527,7 @@ if ( ! function_exists('url_title'))
*
* @access public
* @param string the URL
- * @param string the method: location or redirect
+ * @param string the method: location or refresh
* @return string
*/
if ( ! function_exists('redirect'))