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

fixing merge issues

Browse Source
This commit is contained in:
Dayle Rees
2012-07-27 13:52:15 +01:00
parent da35e257fd b325e954e3
commit 2c6ed23b45
48 changed files with 101 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
laravel/url.php
View File

@@ -101,8 +101,8 @@ class URL {
return $url;
}
// Unless $https is specified (true or false) then maintain the current request
// security for any new links generated. So https for all secure links.
// Unless $https is specified (true or false), we maintain the current request
// security for any new links generated. So https for all secure links.
if (is_null($https)) $https = Request::secure();
$root = static::base().'/'.Config::get('application.index');
@@ -177,7 +177,7 @@ class URL {
}
/**
* Generate a action URL from a route definition
* Generate an action URL from a route definition
*
* @param array $route
* @param string $action
@@ -204,7 +204,7 @@ class URL {
$bundle = Bundle::get($bundle);
// If a bundle exists for the action, we will attempt to use it's "handles"
// If a bundle exists for the action, we will attempt to use its "handles"
// clause as the root of the generated URL, as the bundle can only handle
// URIs that begin with that string and no others.
$root = $bundle['handles'] ?: '';
@@ -329,4 +329,4 @@ class URL {
return filter_var($url, FILTER_VALIDATE_URL) !== false;
}
}
}