Prevented custom HTML being inserted on settings page

Gives option for fixing if badly formatted HTML is inserted. Closes #310

Prevented custom HTML being inserted on settings page
Gives option for fixing if badly formatted HTML is inserted. Closes #310
Dan Brown
Commit af3c0e43a59483511ce0271bdbd43b5845d3d1fa af3c0e43 1 parent 387047f2
Showing 2 changed files with 3 additions and 2 deletions
resources/views/base.blade.php
routes/web.php
--- a/resources/views/base.blade.php
View file @af3c0e4
+++ b/resources/views/base.blade.php
View file @af3c0e4
@@ -23,9 +23,10 @@
 
     @include('partials/custom-styles')
 
+     @if(setting('app-custom-head') && \Route::currentRouteName() !== 'settings')
         <!-- Custom user content -->
-     @if(setting('app-custom-head'))
         {!! setting('app-custom-head') !!}
+         <!-- End custom user content -->
     @endif
 </head>
 <body class="@yield('body-class')" ng-app="bookStack">
--- a/routes/web.php
View file @af3c0e4
+++ b/routes/web.php
View file @af3c0e4
@@ -129,7 +129,7 @@ Route::group(['middleware' => 'auth'], function () {
 
     // Settings
     Route::group(['prefix' => 'settings'], function() {
-         Route::get('/', 'SettingController@index');
+         Route::get('/', 'SettingController@index')->name('settings');
         Route::post('/', 'SettingController@update');
 
         // Users