Allow the specification of a asset base URL.

This commit is contained in:
Taylor Otwell
2012-04-30 11:52:30 -05:00
parent 48dae0c3d9
commit efe3de6843
3 changed files with 9 additions and 11 deletions

View File

@@ -220,16 +220,14 @@ 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 )) {
// If a base asset URL is defined in the configuration, use that and don't
// try and change the HTTP protocol. This allows the delivery of assets
// through a different server or third-party content delivery network.
if ($root = Config::get('application.asset_url', false))
{
return rtrim($root, '/').'/'.ltrim($url, '/');
}
if (is_null($https)) $https = Request::secure();