mirror of https://github.com/MISP/MISP
Fix to an issue introduced in 2.3.128 that incorrectly causes MISP to not sync due to a version mismatch
parent
7f3996f43b
commit
cfec8d65e4
|
@ -80,7 +80,7 @@ class AppController extends Controller {
|
||||||
|
|
||||||
public function beforeFilter() {
|
public function beforeFilter() {
|
||||||
$versionArray = $this->{$this->modelClass}->checkMISPVersion();
|
$versionArray = $this->{$this->modelClass}->checkMISPVersion();
|
||||||
$this->mispVersion = implode('.', array_values($versionArray));
|
$this->mispVersionFull = implode('.', array_values($versionArray));
|
||||||
$this->Security->blackHoleCallback = 'blackHole';
|
$this->Security->blackHoleCallback = 'blackHole';
|
||||||
// send users away that are using ancient versions of IE
|
// send users away that are using ancient versions of IE
|
||||||
// Make sure to update this if IE 20 comes out :)
|
// Make sure to update this if IE 20 comes out :)
|
||||||
|
@ -153,6 +153,7 @@ class AppController extends Controller {
|
||||||
if ($this->Auth->user()) {
|
if ($this->Auth->user()) {
|
||||||
//$this->_refreshAuth();
|
//$this->_refreshAuth();
|
||||||
$this->set('mispVersion', $this->mispVersion);
|
$this->set('mispVersion', $this->mispVersion);
|
||||||
|
$this->set('mispVersionFull', $this->mispVersionFull);
|
||||||
$role = $this->getActions();
|
$role = $this->getActions();
|
||||||
$this->set('me', $this->Auth->user());
|
$this->set('me', $this->Auth->user());
|
||||||
$this->set('isAdmin', $role['perm_admin']);
|
$this->set('isAdmin', $role['perm_admin']);
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
<div class = "footerText footerCenterText">
|
<div class = "footerText footerCenterText">
|
||||||
<?php
|
<?php
|
||||||
$footerText = Configure::read('MISP.footerpart1') . ' ' . Configure::read('MISP.footerpart2');
|
$footerText = Configure::read('MISP.footerpart1') . ' ' . Configure::read('MISP.footerpart2');
|
||||||
if (isset($me['id'])) $footerText = Configure::read('MISP.footerpart1') . ' version ' . $mispVersion . ' ' . Configure::read('MISP.footerpart2');
|
if (isset($me['id'])) $footerText = Configure::read('MISP.footerpart1') . ' version ' . $mispVersionFull . ' ' . Configure::read('MISP.footerpart2');
|
||||||
?>
|
?>
|
||||||
<span> <?php echo h($footerText); ?> </span>
|
<span> <?php echo h($footerText); ?> </span>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue