Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes

This commit is contained in:
Colin Viebrock 2012-04-23 23:43:09 -05:00
parent 71d361e071
commit 11b0d243ff
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
laravel/bundle.php
View File

@ -297,9 +297,7 @@ public static function assets($bundle)
{ {
if (is_null($bundle)) return static::assets(DEFAULT_BUNDLE); if (is_null($bundle)) return static::assets(DEFAULT_BUNDLE);
$server = Config::get('application.asset_url', URL::base() ); return ($bundle != DEFAULT_BUNDLE) ? "/bundles/{$bundle}/" : '/';
return ($bundle != DEFAULT_BUNDLE) ? $server."/bundles/{$bundle}/" : $server.'/';
} }
/** /**

12
laravel/url.php
View File

@ -220,6 +220,18 @@ protected static function convention($action, $parameters)
*/ */
public static function to_asset($url, $https = null) public static function to_asset($url, $https = null)
{ {
// If the URL is already well-formed, just return it
if (static::valid($url)) return $url;
// If a base asset URL is defined in the configuration, use that and
// don't try and change links to http/https.
if ($root = Config::get('application.asset_url', false )) {
return rtrim($root, '/').'/'.ltrim($url, '/');
}
if (is_null($https)) $https = Request::secure(); if (is_null($https)) $https = Request::secure();
$url = static::to($url, $https); $url = static::to($url, $https);