Tweaking comments in URL class.
This commit is contained in:
parent
60c9c91516
commit
767a49f54b
|
@ -19,8 +19,8 @@ public static function to($url = '', $https = false, $asset = false)
|
||||||
|
|
||||||
$base = Config::get('application.url');
|
$base = Config::get('application.url');
|
||||||
|
|
||||||
// Assets live in the public directory, so we only want to append
|
// Assets live in the public directory, and should not have
|
||||||
// the index file if the URL is to an asset.
|
// the index file appended to their URLs.
|
||||||
if ( ! $asset)
|
if ( ! $asset)
|
||||||
{
|
{
|
||||||
$base .= '/'.Config::get('application.index');
|
$base .= '/'.Config::get('application.index');
|
||||||
|
@ -60,6 +60,10 @@ public static function to_asset($url)
|
||||||
/**
|
/**
|
||||||
* Generate a URL from a route name.
|
* Generate a URL from a route name.
|
||||||
*
|
*
|
||||||
|
* For routes that have wildcard parameters, an array may be passed as the
|
||||||
|
* second parameter to the method. The values of this array will be used
|
||||||
|
* to fill the wildcard segments of the route URI.
|
||||||
|
*
|
||||||
* @param string $name
|
* @param string $name
|
||||||
* @param array $parameters
|
* @param array $parameters
|
||||||
* @param bool $https
|
* @param bool $https
|
||||||
|
@ -69,13 +73,10 @@ public static function to_route($name, $parameters = array(), $https = false)
|
||||||
{
|
{
|
||||||
if ( ! is_null($route = Route\Finder::find($name)))
|
if ( ! is_null($route = Route\Finder::find($name)))
|
||||||
{
|
{
|
||||||
// Get the first URI assigned to the route.
|
|
||||||
$uris = explode(', ', key($route));
|
$uris = explode(', ', key($route));
|
||||||
|
|
||||||
$uri = substr($uris[0], strpos($uris[0], '/'));
|
$uri = substr($uris[0], strpos($uris[0], '/'));
|
||||||
|
|
||||||
// Replace any parameters in the URI. This allows the dynamic creation of URLs
|
|
||||||
// that contain parameter wildcards.
|
|
||||||
foreach ($parameters as $parameter)
|
foreach ($parameters as $parameter)
|
||||||
{
|
{
|
||||||
$uri = preg_replace('/\(.+?\)/', $parameter, $uri, 1);
|
$uri = preg_replace('/\(.+?\)/', $parameter, $uri, 1);
|
||||||
|
|
Loading…
Reference in New Issue