|
@@ -26,7 +26,7 @@ class URL {
|
|
*/
|
|
*/
|
|
public static function current()
|
|
public static function current()
|
|
{
|
|
{
|
|
- return static::to(URI::current());
|
|
|
|
|
|
+ return static::to(URI::current(), null, false, false);
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -89,9 +89,11 @@ class URL {
|
|
*
|
|
*
|
|
* @param string $url
|
|
* @param string $url
|
|
* @param bool $https
|
|
* @param bool $https
|
|
|
|
+ * @param bool $asset
|
|
|
|
+ * @param bool $locale
|
|
* @return string
|
|
* @return string
|
|
*/
|
|
*/
|
|
- public static function to($url = '', $https = null)
|
|
|
|
|
|
+ public static function to($url = '', $https = null, $asset = false, $locale = true)
|
|
{
|
|
{
|
|
// If the given URL is already valid or begins with a hash, we'll just return
|
|
// If the given URL is already valid or begins with a hash, we'll just return
|
|
// the URL unchanged since it is already well formed. Otherwise we will add
|
|
// the URL unchanged since it is already well formed. Otherwise we will add
|
|
@@ -105,7 +107,17 @@ class URL {
|
|
// security for any new links generated. So https for all secure links.
|
|
// security for any new links generated. So https for all secure links.
|
|
if (is_null($https)) $https = Request::secure();
|
|
if (is_null($https)) $https = Request::secure();
|
|
|
|
|
|
- $root = static::base().'/'.Config::get('application.index');
|
|
|
|
|
|
+ $root = static::base();
|
|
|
|
+
|
|
|
|
+ if ( ! $asset)
|
|
|
|
+ {
|
|
|
|
+ $root .= '/'.Config::get('application.index');
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if ( ! $asset and $locale and count(Config::get('application.languages')) > 0)
|
|
|
|
+ {
|
|
|
|
+ $root .= '/'.Config::get('application.language');
|
|
|
|
+ }
|
|
|
|
|
|
// Since SSL is not often used while developing the application, we allow the
|
|
// Since SSL is not often used while developing the application, we allow the
|
|
// developer to disable SSL on all framework generated links to make it more
|
|
// developer to disable SSL on all framework generated links to make it more
|
|
@@ -232,7 +244,7 @@ class URL {
|
|
return rtrim($root, '/').'/'.ltrim($url, '/');
|
|
return rtrim($root, '/').'/'.ltrim($url, '/');
|
|
}
|
|
}
|
|
|
|
|
|
- $url = static::to($url, $https);
|
|
|
|
|
|
+ $url = static::to($url, $https, true);
|
|
|
|
|
|
// Since assets are not served by Laravel, we do not need to come through
|
|
// Since assets are not served by Laravel, we do not need to come through
|
|
// the front controller. So, we'll remove the application index specified
|
|
// the front controller. So, we'll remove the application index specified
|