MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

Merge branch '2.4' of github.com:MISP/MISP into 2.4

pull/3995/head
mokaddem 2019-01-08 08:21:14 +01:00
parent 56b87abe92 2175f5c289
commit 7df7a2f15f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/View/Layouts/default.ctp
View File

@ -48,12 +48,12 @@
?>
</div>
<div id="flashContainer" style="padding-top:<?php echo $topPadding; ?>px; !important;">
<?php
echo sprintf('<div id="main-view-container" class="container-fluid ">');
$flash = $this->Flash->render();
echo $flash;
echo '</div>';
?>
<div id="main-view-container" class="container-fluid ">
<?php
$flash = $this->Flash->render();
echo $flash;
?>
</div>
</div>
<div>
<?php
@ -103,7 +103,7 @@
tabIsActive = true;
});
<?php
if (!Configure::read('MISP.disable_auto_logout')):
if (!Configure::read('MISP.disable_auto_logout') and $me):
?>
checkIfLoggedIn();
<?php