webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-08-09 10:22:51 +03:00
Code Activity

Filtered scripts in custom HTML head for exports

Browse Source 
Since it appeared to cause problems in some scenarios.
Related to #2490
This commit is contained in:
Dan Brown
2021-05-03 23:59:52 +01:00
parent c50ac022a8
commit 43b6633183
10 changed files with 101 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/books/export.blade.php
View File

@@ -27,7 +27,7 @@
}
</style>
@yield('head')
@include('partials.custom-head')
@include('partials.export-custom-head')
</head>
<body>

2
resources/views/chapters/export.blade.php
View File

@@ -19,7 +19,7 @@
}
}
</style>
@include('partials.custom-head')
@include('partials.export-custom-head')
</head>
<body>

2
resources/views/pages/export.blade.php
View File

@@ -29,7 +29,7 @@
</style>
@endif
@include('partials.custom-head')
@include('partials.export-custom-head')
</head>
<body>

5
resources/views/partials/custom-head-content.blade.php
View File

@@ -1,5 +0,0 @@
@if(setting('app-custom-head', false))
<!-- Custom user content -->
{!! setting('app-custom-head') !!}
<!-- End custom user content -->
@endif

6
resources/views/partials/custom-head.blade.php
View File

@@ -1,5 +1,5 @@
@if(setting('app-custom-head') && \Route::currentRouteName() !== 'settings')
<!-- Custom user content -->
{!! setting('app-custom-head') !!}
<!-- End custom user content -->
<!-- Custom user content -->
{!! setting('app-custom-head') !!}
<!-- End custom user content -->
@endif

5
resources/views/partials/export-custom-head.blade.php Normal file
View File

@@ -0,0 +1,5 @@
@if(setting('app-custom-head'))
<!-- Custom user content -->
{!! \BookStack\Util\HtmlContentFilter::removeScripts(setting('app-custom-head')) !!}
<!-- End custom user content -->
@endif