summaryrefslogtreecommitdiffstats
path: root/system/helpers
diff options
context:
space:
mode:
authorphilsturgeon <devnull@localhost>2011-06-15 17:03:29 +0200
committerphilsturgeon <devnull@localhost>2011-06-15 17:03:29 +0200
commitb2e728f9ec393b181d287717a5e2adbc781aad82 (patch)
treec939618480a8296d15e4d6c9dd6f9a9ddca4acd7 /system/helpers
parent96bf25d7c6bb73e957a522db11cd8b42a5aa6cd3 (diff)
parent76696d76e137e98f0597547b71b40a991d8b025b (diff)
Merged base_url changes.
Diffstat (limited to 'system/helpers')
-rw-r--r--system/helpers/url_helper.php11
1 files changed, 7 insertions, 4 deletions
diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php
index 8e93744fb..d2fa47074 100644
--- 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);
}
}