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

Merge pull request #578 from cviebrock/asset-url

Browse Source 
Configuration option to set different base URL for assets
This commit is contained in:
Taylor Otwell
2012-04-30 09:49:06 -07:00
parent 5591307099 95dc06ad2f
commit 48dae0c3d9
3 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
laravel/bundle.php
View File

@@ -297,7 +297,7 @@ class Bundle {
{
if (is_null($bundle)) return static::assets(DEFAULT_BUNDLE);
return ($bundle != DEFAULT_BUNDLE) ? URL::base()."/bundles/{$bundle}/" : URL::base().'/';
return ($bundle != DEFAULT_BUNDLE) ? "/bundles/{$bundle}/" : '/';
}
/**

12
laravel/url.php
View File

@@ -220,6 +220,18 @@ class URL {
*/
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();
$url = static::to($url, $https);