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

removed packages directory. refactoring.

Browse Source
This commit is contained in:
Taylor Otwell
2011-10-21 21:49:33 -05:00
parent 80f810de24
commit b71ecb4363
13 changed files with 109 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
laravel/url.php
View File

@@ -20,10 +20,6 @@ class URL {
{
if (filter_var($url, FILTER_VALIDATE_URL) !== false) return $url;
// First, we build the base URL for the application, as well as handle the generation
// of links using SSL. It is possible for the developer to disable the generation
// of SSL links throughout the application, making it more convenient to create
// applications without SSL on the development box.
$base = Config::$items['application']['url'].'/'.Config::$items['application']['index'];
if ($https and Config::$items['application']['ssl'])
@@ -99,8 +95,9 @@ class URL {
$uri = preg_replace('/\(.+?\)/', $parameter, $uri, 1);
}
// Before generating the route URL, we will replace all remaining optional
// wildcard segments that were not replaced by parameters with spaces.
// Replace all remaining optional segments with spaces. Since the
// segments are, obviously, optional, some of them may not have
// been assigned values from the parameter array.
return static::to(str_replace(array('/(:any?)', '/(:num?)'), '', $uri), $https);
}