From 5742276fe6b6a2e96e22fa79989dd2b29f6e5604 Mon Sep 17 00:00:00 2001 From: Pedro Borges Date: Tue, 26 Jul 2011 10:01:55 -0300 Subject: [PATCH 1/2] Bug fixed on cookie.php --- system/cookie.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/cookie.php b/system/cookie.php index 97cffd2d..7bf83d02 100644 --- a/system/cookie.php +++ b/system/cookie.php @@ -72,7 +72,7 @@ class Cookie { */ public static function forget($name) { - return static::put($key, null, -60); + return static::put($name, null, -60); } } \ No newline at end of file From 8871ddff1b4266123d4bf41f915737d1d8e9d6c2 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Thu, 28 Jul 2011 11:09:13 -0500 Subject: [PATCH 2/2] Fixed bug in URL::to method. --- system/url.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/system/url.php b/system/url.php index 30cd3c2d..78361326 100644 --- a/system/url.php +++ b/system/url.php @@ -21,9 +21,15 @@ class URL { $base = Config::get('application.url').'/'.Config::get('application.index'); - $base = ($asset) ? str_replace('/'.Config::get('application.index'), '', $base) : $base; + if ($asset and Config::get('application.index') !== '') + { + $base = str_replace('/'.Config::get('application.index'), '', $base); + } - $base = ($https and strpos($base, 'http://') === 0) ? 'https://'.substr($base, 7) : $base; + if ($https and strpos($base, 'http://') === 0) + { + $base = 'https://'.substr($base, 7); + } return rtrim($base, '/').'/'.ltrim($url, '/'); }