summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorRick Ellis <rick.ellis@ellislab.com>2008-08-20 00:12:26 +0200
committerRick Ellis <rick.ellis@ellislab.com>2008-08-20 00:12:26 +0200
commit9e2c04cf14fe8fb27d5ac520c95c68336255b2db (patch)
treeb5dd66949437cb9bff14decf4127d233b40923af /system
parentcbde3f032de0f02fb28a5502a32c30626119716e (diff)
Added current_url() and uri_string() functions to the URL helper
Diffstat (limited to 'system')
-rw-r--r--system/helpers/url_helper.php42
1 files changed, 40 insertions, 2 deletions
diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php
index 16dd3e021..e5b02972d 100644
--- a/system/helpers/url_helper.php
+++ b/system/helpers/url_helper.php
@@ -45,7 +45,7 @@ if ( ! function_exists('site_url'))
return $CI->config->site_url($uri);
}
}
-
+
// ------------------------------------------------------------------------
/**
@@ -64,7 +64,45 @@ if ( ! function_exists('base_url'))
return $CI->config->slash_item('base_url');
}
}
-
+
+// ------------------------------------------------------------------------
+
+/**
+ * Current URL
+ *
+ * Returns the full URL (including segments) of the page where this
+ * function is placed
+ *
+ * @access public
+ * @return string
+ */
+if ( ! function_exists('current_url'))
+{
+ function current_url()
+ {
+ $CI =& get_instance();
+ return $CI->config->site_url($CI->uri->uri_string());
+ }
+}
+
+// ------------------------------------------------------------------------
+/**
+ * URL String
+ *
+ * Returns the URI segments.
+ *
+ * @access public
+ * @return string
+ */
+if ( ! function_exists('uri_string'))
+{
+ function uri_string()
+ {
+ $CI =& get_instance();
+ return $CI->uri->uri_string();
+ }
+}
+
// ------------------------------------------------------------------------
/**