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

Merge pull request #3989 from cvandeplas/2.4 

fix: Fixes javascript issue #3952
pull/3995/head
Andras Iklody 2019-01-07 18:20:09 +01:00 committed by GitHub
parent 735bd72e9e e3e88ac809
commit 2175f5c289
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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