diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-09-04 20:15:21 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-09-04 20:15:21 -0700 |
| commit | ca1947a1ce9d3f70df88c6a5f6260923c5f035c1 (patch) | |
| tree | 40003c6604b129275102dae70f5fa253d7981820 /system/helpers | |
| parent | f63766556a701c173f578caea58597ea7febb865 (diff) | |
Updated upstream to r4554
Diffstat (limited to 'system/helpers')
| -rw-r--r-- | system/helpers/url.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/system/helpers/url.php b/system/helpers/url.php index f3d0ec8b..56f6db4b 100644 --- a/system/helpers/url.php +++ b/system/helpers/url.php @@ -2,7 +2,7 @@ /** * URL helper class. * - * $Id: url.php 4029 2009-03-03 12:39:32Z Shadowhand $ + * $Id: url.php 4479 2009-07-23 04:51:22Z ixmatus $ * * @package Core * @author Kohana Team @@ -15,11 +15,14 @@ class url_Core { * Fetches the current URI. * * @param boolean include the query string + * @param boolean include the suffix * @return string */ - public static function current($qs = FALSE) + public static function current($qs = FALSE, $suffix = FALSE) { - return ($qs === TRUE) ? Router::$complete_uri : Router::$current_uri; + $uri = ($qs === TRUE) ? Router::$complete_uri : Router::$current_uri; + + return ($suffix === TRUE) ? $uri.Kohana::config('core.url_suffix') : $uri; } /** |