stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2024-10-29 21:07:18 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated upstream to r4554

Browse Source
This commit is contained in:
Bharat Mediratta 2009-09-04 20:15:21 -07:00
parent f63766556a
commit ca1947a1ce
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
system/helpers/url.php
View File

@ -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;
}
/**

9
system/libraries/Session.php
View File

@ -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();