diff options
author | Florian Pritz <bluewind@xinu.at> | 2011-08-21 17:09:54 +0200 |
---|---|---|
committer | Florian Pritz <bluewind@xinu.at> | 2011-08-21 17:09:54 +0200 |
commit | 9f52b09abe8dd2919cf9b5d22d12abb0203eb8a8 (patch) | |
tree | fd94ba9616ccc4cfbdb3ecfddece0ce2fa1bba24 /system/helpers/url_helper.php | |
parent | caec47b75d132b98a1b251448a46d3756d05c7b8 (diff) | |
parent | c09370bebb08082ab0655a964a6e6e1331ed47fb (diff) |
Merge branch 'working'
Diffstat (limited to 'system/helpers/url_helper.php')
-rwxr-xr-x | system/helpers/url_helper.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php index d0516cee6..9f4b85248 100755 --- a/system/helpers/url_helper.php +++ b/system/helpers/url_helper.php @@ -50,18 +50,21 @@ if ( ! function_exists('site_url')) /** * Base URL - * - * Returns the "base_url" item from your config file + * + * Create a local URL based on your basepath. + * Segments can be passed in as a string or an array, same as site_url + * or a URL to a file can be passed in, e.g. to an image file. * * @access public + * @param string * @return string */ if ( ! function_exists('base_url')) { - function base_url() + function base_url($uri = '') { $CI =& get_instance(); - return $CI->config->slash_item('base_url'); + return $CI->config->base_url($uri); } } |