mirror of
https://github.com/BookStackApp/BookStack.git
synced 2024-10-30 07:32:39 +01:00
Merge branch 'master' of github.com:BookStackApp/BookStack
This commit is contained in:
commit
58a6b2df7d
@ -201,5 +201,4 @@ class Entity extends Ownable
|
||||
{
|
||||
return '/';
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -784,7 +784,9 @@ class EntityRepo
|
||||
$scriptSearchRegex = '/<script.*?>.*?<\/script>/ms';
|
||||
$matches = [];
|
||||
preg_match_all($scriptSearchRegex, $html, $matches);
|
||||
if (count($matches) === 0) return $html;
|
||||
if (count($matches) === 0) {
|
||||
return $html;
|
||||
}
|
||||
|
||||
foreach ($matches[0] as $match) {
|
||||
$html = str_replace($match, htmlentities($match), $html);
|
||||
|
@ -192,7 +192,8 @@ class ImageService extends UploadService
|
||||
* @param Image $image
|
||||
* @return boolean
|
||||
*/
|
||||
protected function isGif(Image $image) {
|
||||
protected function isGif(Image $image)
|
||||
{
|
||||
return strtolower(pathinfo($this->getPath($image), PATHINFO_EXTENSION)) === 'gif';
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user