TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

URL -> Url

This commit is contained in:
Samuel Georges 2016-08-20 14:26:21 +10:00
parent 7373cf2bfb
commit 3698f13acb
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/cms/classes/Controller.php
View File

@ -1,6 +1,6 @@
<?php namespace Cms\Classes;
use URL;
use Url;
use Str;
use App;
use File;
@ -1132,10 +1132,10 @@ class Controller
$actionExists = Route::getRoutes()->getByAction($routeAction) !== null;
if ($actionExists) {
return URL::action($routeAction, ['slug' => $url]);
return Url::action($routeAction, ['slug' => $url]);
}
else {
return URL::to($url);
return Url::to($url);
}
}
@ -1165,14 +1165,14 @@ class Controller
$themeDir = $this->getTheme()->getDirName();
if (is_array($url)) {
$_url = URL::to(CombineAssets::combine($url, themes_path().'/'.$themeDir));
$_url = Url::to(CombineAssets::combine($url, themes_path().'/'.$themeDir));
}
else {
$_url = Config::get('cms.themesPath', '/themes').'/'.$themeDir;
if ($url !== null) {
$_url .= '/'.$url;
}
$_url = URL::asset($_url);
$_url = Url::asset($_url);
}
return $_url;