mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-05-13 05:01:43 +00:00
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
This commit is contained in:
commit
ceeedcdd92
|
@ -200,6 +200,7 @@
|
||||||
- fix potential clickjacking attack with manipulated email address of a user
|
- fix potential clickjacking attack with manipulated email address of a user
|
||||||
- loading more items on ViewFolder page obeys sort order
|
- loading more items on ViewFolder page obeys sort order
|
||||||
- fix possible csrf attacks due to missing form token
|
- fix possible csrf attacks due to missing form token
|
||||||
|
(CVE-2021–26215, CVE-2021–26216)
|
||||||
- show an error msg on the documents detail page if the checksum of version
|
- show an error msg on the documents detail page if the checksum of version
|
||||||
mismatch
|
mismatch
|
||||||
- overhaul notifications, type of receiver is now passed to notification
|
- overhaul notifications, type of receiver is now passed to notification
|
||||||
|
|
|
@ -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="../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.'/jqtree/tree.jquery.js"></script>'."\n";
|
||||||
// echo '<script type="text/javascript" src="../styles/'.$this->theme.'/jquery-cookie/jquery.cookie.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'];
|
echo $this->extraheader['favicon'];
|
||||||
else {
|
else {
|
||||||
echo '<link rel="icon" href="../views/'.$this->theme.'/images/favicon.svg" type="image/svg+xml"/>'."\n";
|
echo '<link rel="icon" href="../views/'.$this->theme.'/images/favicon.svg" type="image/svg+xml"/>'."\n";
|
||||||
|
|
Loading…
Reference in New Issue
Block a user