diff --git a/modules/backend/facades/Backend.php b/modules/backend/facades/Backend.php index bc24b37d1..8f9966e35 100644 --- a/modules/backend/facades/Backend.php +++ b/modules/backend/facades/Backend.php @@ -7,9 +7,7 @@ class Backend extends Facade /** * Get the registered name of the component. * - * Resolves to: - * - Backend\Helpers\Backend - * + * @see \Backend\Helpers\Backend * @return string */ protected static function getFacadeAccessor() diff --git a/modules/backend/helpers/Backend.php b/modules/backend/helpers/Backend.php index 2977b1ac6..f9a141af5 100644 --- a/modules/backend/helpers/Backend.php +++ b/modules/backend/helpers/Backend.php @@ -13,6 +13,7 @@ use Backend\Classes\Skin; * Backend Helper * * @package october\backend + * @see \Backend\Facades\Backend * @author Alexey Bobkov, Samuel Georges */ class Backend diff --git a/modules/cms/classes/Controller.php b/modules/cms/classes/Controller.php index 80cf06def..18563ca0b 100644 --- a/modules/cms/classes/Controller.php +++ b/modules/cms/classes/Controller.php @@ -1,12 +1,12 @@ getByAction($routeAction) !== null; - - if ($actionExists) { - return Url::action($routeAction, ['slug' => $url]); - } - else { - return Url::to($url); - } + return Cms::url($url); } /** diff --git a/modules/cms/facades/Cms.php b/modules/cms/facades/Cms.php new file mode 100644 index 000000000..21ac2b16e --- /dev/null +++ b/modules/cms/facades/Cms.php @@ -0,0 +1,17 @@ +getByAction($routeAction) !== null; + } + + if (substr($path, 0, 1) == '/') { + $path = substr($path, 1); + } + + if (self::$actionExists) { + return Url::action($routeAction, ['slug' => $path]); + } + else { + return Url::to($path); + } + } +} \ No newline at end of file diff --git a/modules/system/ServiceProvider.php b/modules/system/ServiceProvider.php index 63040b869..b0aa83c2f 100644 --- a/modules/system/ServiceProvider.php +++ b/modules/system/ServiceProvider.php @@ -94,6 +94,10 @@ class ServiceProvider extends ModuleServiceProvider */ protected function registerSingletons() { + App::singleton('cms.helper', function () { + return new \Cms\Helpers\Cms; + }); + App::singleton('backend.helper', function () { return new \Backend\Helpers\Backend; }); diff --git a/modules/system/aliases.php b/modules/system/aliases.php index 7071302d1..bcb2c78b2 100644 --- a/modules/system/aliases.php +++ b/modules/system/aliases.php @@ -52,6 +52,7 @@ return [ 'Twig' => October\Rain\Support\Facades\Twig::class, 'DbDongle' => October\Rain\Support\Facades\DbDongle::class, 'Schema' => October\Rain\Support\Facades\Schema::class, + 'Cms' => Cms\Facades\Cms::class, 'Backend' => Backend\Facades\Backend::class, 'BackendMenu' => Backend\Facades\BackendMenu::class, 'BackendAuth' => Backend\Facades\BackendAuth::class,