Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

This commit is contained in:
Uwe Steinmann 2021-04-05 10:24:28 +02:00
commit ceeedcdd92
2 changed files with 2 additions and 1 deletions

View File

@ -200,6 +200,7 @@
- fix potential clickjacking attack with manipulated email address of a user
- loading more items on ViewFolder page obeys sort order
- fix possible csrf attacks due to missing form token
(CVE-202126215, CVE-202126216)
- show an error msg on the documents detail page if the checksum of version
mismatch
- overhaul notifications, type of receiver is now passed to notification

View File

@ -120,7 +120,7 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common {
echo '<script type="text/javascript" src="../views/'.$this->theme.'/vendors/noty/themes/default.js"></script>'."\n";
echo '<script type="text/javascript" src="../styles/'.$this->theme.'/jqtree/tree.jquery.js"></script>'."\n";
// echo '<script type="text/javascript" src="../styles/'.$this->theme.'/jquery-cookie/jquery.cookie.js"></script>'."\n";
if($this->extraheader['favicon'])
if(!empty($this->extraheader['favicon']))
echo $this->extraheader['favicon'];
else {
echo '<link rel="icon" href="../views/'.$this->theme.'/images/favicon.svg" type="image/svg+xml"/>'."\n";