ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Taylor Otwell
2011-07-28 12:26:45 -05:00
parent 829a629200 8871ddff1b
commit ce39e48458
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
system/cookie.php
View File

@@ -72,7 +72,7 @@ class Cookie {
*/ */
public static function forget($name) public static function forget($name)
{ {
return static::put($key, null, -60); return static::put($name, null, -60);
} }
} }

10
system/url.php
View File

@@ -21,9 +21,15 @@ class URL {
$base = Config::get('application.url').'/'.Config::get('application.index'); $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, '/'); return rtrim($base, '/').'/'.ltrim($url, '/');
} }