Updated upstream to r4554

2 files changed, 13 insertions, 5 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;
 	}
 
 	/**
diff --git a/system/libraries/Session.php b/system/libraries/Session.php
index 670ee6a6..51acce00 100644
--- a/system/libraries/Session.php
+++ b/system/libraries/Session.php
@@ -2,7 +2,7 @@
 /**
  * Session library.
  *
- * $Id: Session.php 4433 2009-07-01 03:44:20Z kiall $
+ * $Id: Session.php 4493 2009-07-27 20:05:41Z ixmatus $
  *
  * @package    Core
  * @author     Kohana Team
@@ -43,11 +43,16 @@ class Session_Core {
 
 		return Session::$instance;
 	}
+	
+	/**
+	 * Be sure to block the use of __clone.
+	 */
+	private function __clone(){}
 
 	/**
 	 * On first session instance creation, sets up the driver and creates session.
 	 */
-	public function __construct()
+	protected function __construct()
 	{
 		$this->input = Input::instance();