route('forum.tag', [
'slug' => $child['attributes']['slug']
]) }}">
{{ $child['attributes']['name'] }}
diff --git a/framework/core/src/Admin/AdminServiceProvider.php b/framework/core/src/Admin/AdminServiceProvider.php
index 51f889f0e..4f815fcef 100644
--- a/framework/core/src/Admin/AdminServiceProvider.php
+++ b/framework/core/src/Admin/AdminServiceProvider.php
@@ -43,9 +43,10 @@ class AdminServiceProvider extends AbstractServiceProvider
$factory = $container->make(RouteHandlerFactory::class);
- $router->middleware('admin')->prefix($config->path('admin'))->group(
- fn (Router $router) => (include __DIR__.'/routes.php')($router, $factory)
- );
+ $router->middleware('admin')
+ ->prefix($config->path('admin'))
+ ->name('admin.')
+ ->group(fn (Router $router) => (include __DIR__.'/routes.php')($router, $factory));
});
$this->container->singleton('flarum.admin.middleware', function () {
diff --git a/framework/core/src/Admin/Controller/UpdateExtensionController.php b/framework/core/src/Admin/Controller/UpdateExtensionController.php
index 1578566ef..4927a076d 100644
--- a/framework/core/src/Admin/Controller/UpdateExtensionController.php
+++ b/framework/core/src/Admin/Controller/UpdateExtensionController.php
@@ -34,6 +34,6 @@ class UpdateExtensionController extends AbstractController
new ToggleExtension($actor, $name, $enabled)
);
- return new RedirectResponse($this->url->to('admin')->base());
+ return new RedirectResponse($this->url->base('admin'));
}
}
diff --git a/framework/core/src/Api/ApiServiceProvider.php b/framework/core/src/Api/ApiServiceProvider.php
index 5e176624c..49b64f7c7 100644
--- a/framework/core/src/Api/ApiServiceProvider.php
+++ b/framework/core/src/Api/ApiServiceProvider.php
@@ -34,9 +34,10 @@ class ApiServiceProvider extends AbstractServiceProvider
$router->middlewareGroup('api', $container->make('flarum.api.middleware'));
- $router->middleware('api')->prefix($config->path('api'))->group(
- fn (Router $router) => (include __DIR__.'/routes.php')($router)
- );
+ $router->middleware('api')
+ ->prefix($config->path('api'))
+ ->name('api.')
+ ->group(fn (Router $router) => (include __DIR__.'/routes.php')($router));
});
$this->container->singleton('flarum.api.throttlers', function () {
diff --git a/framework/core/src/Api/Controller/ListAccessTokensController.php b/framework/core/src/Api/Controller/ListAccessTokensController.php
index f0aea1e7c..51f3afcd0 100644
--- a/framework/core/src/Api/Controller/ListAccessTokensController.php
+++ b/framework/core/src/Api/Controller/ListAccessTokensController.php
@@ -40,7 +40,7 @@ class ListAccessTokensController extends AbstractListController
$tokens = $this->filterer->filter(new QueryCriteria($actor, $filter), $limit, $offset);
$document->addPaginationLinks(
- $this->url->to('api')->route('access-tokens.index'),
+ $this->url->route('api.access-tokens.index'),
$request->query(),
$offset,
$limit,
diff --git a/framework/core/src/Api/Controller/ListDiscussionsController.php b/framework/core/src/Api/Controller/ListDiscussionsController.php
index 8a2522846..d306402e6 100644
--- a/framework/core/src/Api/Controller/ListDiscussionsController.php
+++ b/framework/core/src/Api/Controller/ListDiscussionsController.php
@@ -65,7 +65,7 @@ class ListDiscussionsController extends AbstractListController
}
$document->addPaginationLinks(
- $this->url->to('api')->route('discussions.index'),
+ $this->url->route('api.discussions.index'),
$request->query(),
$offset,
$limit,
diff --git a/framework/core/src/Api/Controller/ListGroupsController.php b/framework/core/src/Api/Controller/ListGroupsController.php
index f2a085119..258e0303e 100644
--- a/framework/core/src/Api/Controller/ListGroupsController.php
+++ b/framework/core/src/Api/Controller/ListGroupsController.php
@@ -47,7 +47,7 @@ class ListGroupsController extends AbstractListController
$queryResults = $this->filterer->filter($criteria, $limit, $offset);
$document->addPaginationLinks(
- $this->url->to('api')->route('groups.index'),
+ $this->url->route('api.groups.index'),
$request->query(),
$offset,
$limit,
diff --git a/framework/core/src/Api/Controller/ListNotificationsController.php b/framework/core/src/Api/Controller/ListNotificationsController.php
index 3d9d63e24..9b272bf2b 100644
--- a/framework/core/src/Api/Controller/ListNotificationsController.php
+++ b/framework/core/src/Api/Controller/ListNotificationsController.php
@@ -63,7 +63,7 @@ class ListNotificationsController extends AbstractListController
}
$document->addPaginationLinks(
- $this->url->to('api')->route('notifications.index'),
+ $this->url->route('api.notifications.index'),
$request->query(),
$offset,
$limit,
diff --git a/framework/core/src/Api/Controller/ListPostsController.php b/framework/core/src/Api/Controller/ListPostsController.php
index 7f0ab43b6..8ea3c9e0b 100644
--- a/framework/core/src/Api/Controller/ListPostsController.php
+++ b/framework/core/src/Api/Controller/ListPostsController.php
@@ -56,7 +56,7 @@ class ListPostsController extends AbstractListController
$results = $this->filterer->filter(new QueryCriteria($actor, $filters, $sort, $sortIsDefault), $limit, $offset);
$document->addPaginationLinks(
- $this->url->to('api')->route('posts.index'),
+ $this->url->route('api.posts.index'),
$request->query(),
$offset,
$limit,
diff --git a/framework/core/src/Api/Controller/ListUsersController.php b/framework/core/src/Api/Controller/ListUsersController.php
index 4fdc54f59..ba4b86182 100644
--- a/framework/core/src/Api/Controller/ListUsersController.php
+++ b/framework/core/src/Api/Controller/ListUsersController.php
@@ -68,7 +68,7 @@ class ListUsersController extends AbstractListController
}
$document->addPaginationLinks(
- $this->url->to('api')->route('users.index'),
+ $this->url->route('api.users.index'),
$request->query(),
$offset,
$limit,
diff --git a/framework/core/src/Api/Serializer/ForumSerializer.php b/framework/core/src/Api/Serializer/ForumSerializer.php
index 1453578a0..9264159c3 100644
--- a/framework/core/src/Api/Serializer/ForumSerializer.php
+++ b/framework/core/src/Api/Serializer/ForumSerializer.php
@@ -69,11 +69,11 @@ class ForumSerializer extends AbstractSerializer
'title' => $this->settings->get('forum_title'),
'description' => $this->settings->get('forum_description'),
'showLanguageSelector' => (bool) $this->settings->get('show_language_selector', true),
- 'baseUrl' => $url = $this->url->to('forum')->base(),
+ 'baseUrl' => $url = $this->url->base('forum'),
'basePath' => $path = parse_url($url, PHP_URL_PATH) ?: '',
'baseOrigin' => substr($url, 0, strlen($url) - strlen($path)),
'debug' => $this->config->inDebugMode(),
- 'apiUrl' => $this->url->to('api')->base(),
+ 'apiUrl' => $this->url->base('api'),
'welcomeTitle' => $this->settings->get('welcome_title'),
'welcomeMessage' => $this->settings->get('welcome_message'),
'themePrimaryColor' => $this->settings->get('theme_primary_color'),
@@ -94,7 +94,7 @@ class ForumSerializer extends AbstractSerializer
];
if ($this->actor->can('administrate')) {
- $attributes['adminUrl'] = $this->url->to('admin')->base();
+ $attributes['adminUrl'] = $this->url->base('admin');
$attributes['version'] = Application::VERSION;
}
diff --git a/framework/core/src/Extend/Concerns/ExtendsRoutes.php b/framework/core/src/Extend/Concerns/ExtendsRoutes.php
index e3371cc04..7f56de06f 100644
--- a/framework/core/src/Extend/Concerns/ExtendsRoutes.php
+++ b/framework/core/src/Extend/Concerns/ExtendsRoutes.php
@@ -43,7 +43,7 @@ trait ExtendsRoutes
$router
->addRoute($route['method'], $route['path'], $action)
->prefix($config->path($this->frontend))
- ->name($route['name']);
+ ->name("$this->frontend.{$route['name']}");
}
}
);
diff --git a/framework/core/src/Extend/Filesystem.php b/framework/core/src/Extend/Filesystem.php
index f1bd90fc6..b367df9f0 100644
--- a/framework/core/src/Extend/Filesystem.php
+++ b/framework/core/src/Extend/Filesystem.php
@@ -46,7 +46,7 @@ class Filesystem implements ExtenderInterface
* ->disk('flarum-uploads', function (Paths $paths, UrlGenerator $url) {
* return [
* 'root' => "$paths->public/assets/uploads",
- * 'url' => $url->to('forum')->path('assets/uploads')
+ * 'url' => $url->path('forum', 'assets/uploads')
* ];
* });
* ```
diff --git a/framework/core/src/Extend/Theme.php b/framework/core/src/Extend/Theme.php
index 3dda047c8..eecf8091a 100644
--- a/framework/core/src/Extend/Theme.php
+++ b/framework/core/src/Extend/Theme.php
@@ -119,7 +119,7 @@ class Theme implements ExtenderInterface
* (new Extend\Theme())
* ->addCustomLessVariable('my-extension__asset_path', function () {
* $url = resolve(UrlGenerator::class);
- * $assetUrl = $url->to('forum')->base().'/assets/extensions/my-extension/my-asset.jpg';
+ * $assetUrl = $url->base('forum').'/assets/extensions/my-extension/my-asset.jpg';
* return "\"$assetUrl\"";
* })
* ```
diff --git a/framework/core/src/Filesystem/FilesystemServiceProvider.php b/framework/core/src/Filesystem/FilesystemServiceProvider.php
index 31273ef95..cfb247b24 100644
--- a/framework/core/src/Filesystem/FilesystemServiceProvider.php
+++ b/framework/core/src/Filesystem/FilesystemServiceProvider.php
@@ -35,14 +35,14 @@ class FilesystemServiceProvider extends AbstractServiceProvider
'flarum-assets' => function (Paths $paths, UrlGenerator $url) {
return [
'root' => "$paths->public/assets",
- 'url' => $url->to('forum')->path('assets'),
+ 'url' => $url->path('forum', 'assets'),
'visibility' => Visibility::PUBLIC
];
},
'flarum-avatars' => function (Paths $paths, UrlGenerator $url) {
return [
'root' => "$paths->public/assets/avatars",
- 'url' => $url->to('forum')->path('assets/avatars')
+ 'url' => $url->path('forum', 'assets/avatars')
];
},
];
diff --git a/framework/core/src/Forum/Content/Discussion.php b/framework/core/src/Forum/Content/Discussion.php
index 868099725..c7b3f5bc7 100644
--- a/framework/core/src/Forum/Content/Discussion.php
+++ b/framework/core/src/Forum/Content/Discussion.php
@@ -60,7 +60,7 @@ class Discussion
$queryString = http_build_query($newQueryParams);
- return $this->url->to('forum')->route('discussion', ['id' => $apiDocument->data->attributes->slug]).
+ return $this->url->route('forum.discussion', ['id' => $apiDocument->data->attributes->slug]).
($queryString ? '?'.$queryString : '');
};
diff --git a/framework/core/src/Forum/Content/Index.php b/framework/core/src/Forum/Content/Index.php
index b61b9e279..b8fa268d0 100644
--- a/framework/core/src/Forum/Content/Index.php
+++ b/framework/core/src/Forum/Content/Index.php
@@ -54,7 +54,7 @@ class Index
$document->content = $this->view->make('flarum.forum::frontend.content.index', compact('apiDocument', 'page'));
$document->payload['apiDocument'] = $apiDocument;
- $document->canonicalUrl = $this->url->to('forum')->base().($defaultRoute === '/all' ? '' : $request->getUri()->getPath());
+ $document->canonicalUrl = $this->url->base('forum').($defaultRoute === '/all' ? '' : $request->getUri()->getPath());
$document->page = $page;
$document->hasNextPage = isset($apiDocument->links->next);
diff --git a/framework/core/src/Forum/Content/User.php b/framework/core/src/Forum/Content/User.php
index 1326ad6f8..6dd2c0325 100644
--- a/framework/core/src/Forum/Content/User.php
+++ b/framework/core/src/Forum/Content/User.php
@@ -32,7 +32,7 @@ class User
$user = $apiDocument->data->attributes;
$document->title = $user->displayName;
- $document->canonicalUrl = $this->url->to('forum')->route('user', ['username' => $user->slug]);
+ $document->canonicalUrl = $this->url->route('forum.user', ['username' => $user->slug]);
$document->payload['apiDocument'] = $apiDocument;
return $document;
diff --git a/framework/core/src/Forum/Controller/ConfirmEmailController.php b/framework/core/src/Forum/Controller/ConfirmEmailController.php
index 8e95075dd..c866f5917 100644
--- a/framework/core/src/Forum/Controller/ConfirmEmailController.php
+++ b/framework/core/src/Forum/Controller/ConfirmEmailController.php
@@ -40,6 +40,6 @@ class ConfirmEmailController extends AbstractController
$token = SessionAccessToken::generate($user->id);
$this->authenticator->logIn($session, $token);
- return new RedirectResponse($this->url->to('forum')->base());
+ return new RedirectResponse($this->url->base('forum'));
}
}
diff --git a/framework/core/src/Forum/Controller/LogOutController.php b/framework/core/src/Forum/Controller/LogOutController.php
index c84451691..c810fa1c1 100644
--- a/framework/core/src/Forum/Controller/LogOutController.php
+++ b/framework/core/src/Forum/Controller/LogOutController.php
@@ -39,7 +39,7 @@ class LogOutController extends AbstractController
$session = $request->attributes->get('session');
$actor = RequestUtil::getActor($request);
- $url = $request->query('return', $this->url->to('forum')->base());
+ $url = $request->query('return', $this->url->base('forum'));
// If there is no user logged in, return to the index.
if ($actor->isGuest()) {
@@ -54,7 +54,7 @@ class LogOutController extends AbstractController
$return = $request->query('return');
$view = $this->view->make('flarum.forum::log-out')
- ->with('url', $this->url->to('forum')->route('logout').'?token='.$csrfToken.($return ? '&return='.urlencode($return) : ''));
+ ->with('url', $this->url->route('forum.logout').'?token='.$csrfToken.($return ? '&return='.urlencode($return) : ''));
return new HtmlResponse($view->render());
}
diff --git a/framework/core/src/Forum/Controller/SavePasswordController.php b/framework/core/src/Forum/Controller/SavePasswordController.php
index fbfeeeae6..6d6d1a96c 100644
--- a/framework/core/src/Forum/Controller/SavePasswordController.php
+++ b/framework/core/src/Forum/Controller/SavePasswordController.php
@@ -60,7 +60,7 @@ class SavePasswordController extends AbstractController
$request->attributes->get('session')->put('errors', new MessageBag($e->errors()));
// @todo: must return a 422 instead, look into renderable exceptions.
- return new RedirectResponse($this->url->to('forum')->route('resetPassword', ['token' => $token->token]));
+ return new RedirectResponse($this->url->route('forum.resetPassword', ['token' => $token->token]));
}
$token->user->changePassword($password);
@@ -72,6 +72,6 @@ class SavePasswordController extends AbstractController
$accessToken = SessionAccessToken::generate($token->user->id);
$this->authenticator->logIn($session, $accessToken);
- return new RedirectResponse($this->url->to('forum')->base());
+ return new RedirectResponse($this->url->base('forum'));
}
}
diff --git a/framework/core/src/Forum/ForumServiceProvider.php b/framework/core/src/Forum/ForumServiceProvider.php
index bcca324cb..96199322d 100644
--- a/framework/core/src/Forum/ForumServiceProvider.php
+++ b/framework/core/src/Forum/ForumServiceProvider.php
@@ -50,9 +50,10 @@ class ForumServiceProvider extends AbstractServiceProvider
$factory = $container->make(RouteHandlerFactory::class);
- $router->middleware('forum')->prefix($config->path('forum'))->group(
- fn (Router $router) => (include __DIR__.'/routes.php')($router, $factory)
- );
+ $router->middleware('forum')
+ ->prefix($config->path('forum'))
+ ->name('forum.')
+ ->group(fn (Router $router) => (include __DIR__.'/routes.php')($router, $factory));
$this->setDefaultRoute(
$router,
diff --git a/framework/core/src/Foundation/Application.php b/framework/core/src/Foundation/Application.php
index 160ed22f6..42b418bf7 100644
--- a/framework/core/src/Foundation/Application.php
+++ b/framework/core/src/Foundation/Application.php
@@ -210,13 +210,14 @@ class Application extends IlluminateContainer implements LaravelApplication
'filesystem' => [\Illuminate\Filesystem\FilesystemManager::class, \Illuminate\Contracts\Filesystem\Factory::class],
'filesystem.disk' => [\Illuminate\Contracts\Filesystem\Filesystem::class],
'filesystem.cloud' => [\Illuminate\Contracts\Filesystem\Cloud::class],
- 'flarum' => [\Illuminate\Contracts\Container\Container::class, \Illuminate\Contracts\Foundation\Application::class, \Psr\Container\ContainerInterface::class, self::class],
+ 'flarum' => [self::class, \Illuminate\Contracts\Container\Container::class, \Illuminate\Contracts\Foundation\Application::class, \Psr\Container\ContainerInterface::class],
'flarum.paths' => [Paths::class],
'hash' => [\Illuminate\Contracts\Hashing\Hasher::class],
'mailer' => [\Illuminate\Mail\Mailer::class, \Illuminate\Contracts\Mail\Mailer::class, \Illuminate\Contracts\Mail\MailQueue::class],
'router' => [\Flarum\Http\Router::class, \Illuminate\Routing\Router::class, \Illuminate\Contracts\Routing\Registrar::class, \Illuminate\Contracts\Routing\BindingRegistrar::class],
'session' => [\Illuminate\Session\SessionManager::class],
'session.store' => [\Illuminate\Session\Store::class, \Illuminate\Contracts\Session\Session::class],
+ 'url' => [\Flarum\Http\UrlGenerator::class, \Illuminate\Routing\UrlGenerator::class, \Illuminate\Contracts\Routing\UrlGenerator::class],
'validator' => [\Illuminate\Validation\Factory::class, \Illuminate\Contracts\Validation\Factory::class],
'view' => [\Illuminate\View\Factory::class, \Illuminate\Contracts\View\Factory::class],
];
diff --git a/framework/core/src/Http/RouteCollectionUrlGenerator.php b/framework/core/src/Http/RouteCollectionUrlGenerator.php
deleted file mode 100644
index 236cbcbd6..000000000
--- a/framework/core/src/Http/RouteCollectionUrlGenerator.php
+++ /dev/null
@@ -1,40 +0,0 @@
-routes->getPath($name, $parameters);
- $path = ltrim($path, '/');
-
- return $this->baseUrl.'/'.$path;
- }
-
- public function path(string $path): string
- {
- return $this->baseUrl.'/'.$path;
- }
-
- public function base(): string
- {
- return $this->baseUrl;
- }
-}
diff --git a/framework/core/src/Http/RoutingServiceProvider.php b/framework/core/src/Http/RoutingServiceProvider.php
index b0d818cbc..9da529fa8 100644
--- a/framework/core/src/Http/RoutingServiceProvider.php
+++ b/framework/core/src/Http/RoutingServiceProvider.php
@@ -13,4 +13,22 @@ class RoutingServiceProvider extends IlluminateRoutingServiceProvider
return new Router($container['events'], $container);
});
}
+
+ protected function registerUrlGenerator(): void
+ {
+ $this->app->singleton('url', function (Container $container) {
+ $routes = $container['router']->getRoutes();
+
+ // The URL generator needs the route collection that exists on the router.
+ // Keep in mind this is an object, so we're passing by references here
+ // and all the registered routes will be available to the generator.
+ $container->instance('routes', $routes);
+
+ return new UrlGenerator(
+ $routes, $container->rebinding(
+ 'request', $this->requestRebinder()
+ ), $container['config']['app.asset_url']
+ );
+ });
+ }
}
diff --git a/framework/core/src/Http/UrlGenerator.php b/framework/core/src/Http/UrlGenerator.php
index 036355ae6..99e201f69 100644
--- a/framework/core/src/Http/UrlGenerator.php
+++ b/framework/core/src/Http/UrlGenerator.php
@@ -1,43 +1,32 @@
config = $config;
}
- /**
- * Register a named route collection for URL generation.
- */
- public function addCollection(string $key, RouteCollection $routes, ?string $prefix = null): static
+ public function base(string $frontend): string
{
- $this->routes[$key] = new RouteCollectionUrlGenerator(
- $this->app->url($prefix),
- $routes
- );
+ $url = $this->config->url();
- return $this;
+ if ($frontend) {
+ $url .= '/'.$this->config->path($frontend);
+ }
+
+ return $url;
}
- /**
- * Retrieve a URL generator instance for the given named route collection.
- */
- public function to(string $collection): RouteCollectionUrlGenerator
+ public function path(string $frontend, string $path): string
{
- return $this->routes[$collection];
+ return $this->base($frontend).'/'.ltrim($path, '/');
}
}
diff --git a/framework/core/src/User/AccountActivationMailerTrait.php b/framework/core/src/User/AccountActivationMailerTrait.php
index f7194e831..560af1859 100644
--- a/framework/core/src/User/AccountActivationMailerTrait.php
+++ b/framework/core/src/User/AccountActivationMailerTrait.php
@@ -28,7 +28,7 @@ trait AccountActivationMailerTrait
{
return [
'username' => $user->display_name,
- 'url' => $this->url->to('forum')->route('confirmEmail', ['token' => $token->token]),
+ 'url' => $this->url->route('forum.confirmEmail', ['token' => $token->token]),
'forum' => $this->settings->get('forum_title')
];
}
diff --git a/framework/core/src/User/EmailConfirmationMailer.php b/framework/core/src/User/EmailConfirmationMailer.php
index d33836248..17cdcfd8b 100644
--- a/framework/core/src/User/EmailConfirmationMailer.php
+++ b/framework/core/src/User/EmailConfirmationMailer.php
@@ -51,7 +51,7 @@ class EmailConfirmationMailer
return [
'username' => $user->display_name,
- 'url' => $this->url->to('forum')->route('confirmEmail', ['token' => $token->token]),
+ 'url' => $this->url->route('forum.confirmEmail', ['token' => $token->token]),
'forum' => $this->settings->get('forum_title')
];
}
diff --git a/framework/core/src/User/Job/RequestPasswordResetJob.php b/framework/core/src/User/Job/RequestPasswordResetJob.php
index d28d570d1..1b04d4dff 100644
--- a/framework/core/src/User/Job/RequestPasswordResetJob.php
+++ b/framework/core/src/User/Job/RequestPasswordResetJob.php
@@ -43,7 +43,7 @@ class RequestPasswordResetJob extends AbstractJob
$data = [
'username' => $user->display_name,
- 'url' => $url->to('forum')->route('resetPassword', ['token' => $token->token]),
+ 'url' => $url->route('forum.resetPassword', ['token' => $token->token]),
'forum' => $settings->get('forum_title'),
];
diff --git a/framework/core/tests/integration/extenders/FilesystemTest.php b/framework/core/tests/integration/extenders/FilesystemTest.php
index 1d146a6a5..f95ee662b 100644
--- a/framework/core/tests/integration/extenders/FilesystemTest.php
+++ b/framework/core/tests/integration/extenders/FilesystemTest.php
@@ -44,7 +44,7 @@ class FilesystemTest extends TestCase
$this->extend((new Extend\Filesystem)->disk('flarum-uploads', function (Paths $paths, UrlGenerator $url) {
return [
'root' => "$paths->public/assets/uploads",
- 'url' => $url->to('forum')->path('assets/uploads')
+ 'url' => $url->path('forum', 'assets/uploads')
];
}));
@@ -148,7 +148,7 @@ class UploadsDisk
{
return [
'root' => "$paths->public/assets/uploads",
- 'url' => $url->to('forum')->path('assets/uploads')
+ 'url' => $url->path('forum', 'assets/uploads')
];
}
}
diff --git a/framework/core/views/error/not_found.blade.php b/framework/core/views/error/not_found.blade.php
index 5613e8f09..0a6b63a7b 100644
--- a/framework/core/views/error/not_found.blade.php
+++ b/framework/core/views/error/not_found.blade.php
@@ -5,7 +5,7 @@
{{ $message }}
-
+
{{ $translator->trans('core.views.error.not_found_return_link', ['forum' => $settings->get('forum_title')]) }}
diff --git a/framework/core/views/frontend/content/admin.blade.php b/framework/core/views/frontend/content/admin.blade.php
index 6f5b6ae55..5068d72da 100644
--- a/framework/core/views/frontend/content/admin.blade.php
+++ b/framework/core/views/frontend/content/admin.blade.php
@@ -50,7 +50,7 @@