From cfec8d65e4370bc93d48a4ece5ec9f54925ba0e4 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Thu, 17 Sep 2015 11:28:57 +0200
Subject: [PATCH] Fix to an issue introduced in 2.3.128 that incorrectly causes
 MISP to not sync due to a version mismatch

---
 app/Controller/AppController.php | 3 ++-
 app/View/Elements/footer.ctp     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php
index e752617cd..ae4fb95d5 100755
--- a/app/Controller/AppController.php
+++ b/app/Controller/AppController.php
@@ -80,7 +80,7 @@ class AppController extends Controller {
 	
 	public function beforeFilter() {
 		$versionArray = $this->{$this->modelClass}->checkMISPVersion();
-		$this->mispVersion = implode('.', array_values($versionArray));
+		$this->mispVersionFull = implode('.', array_values($versionArray));
 		$this->Security->blackHoleCallback = 'blackHole';
 		// send users away that are using ancient versions of IE
 		// Make sure to update this if IE 20 comes out :)
@@ -153,6 +153,7 @@ class AppController extends Controller {
 		if ($this->Auth->user()) {
 			//$this->_refreshAuth();
 			$this->set('mispVersion', $this->mispVersion);
+			$this->set('mispVersionFull', $this->mispVersionFull);
 			$role = $this->getActions();
 			$this->set('me', $this->Auth->user());
 			$this->set('isAdmin', $role['perm_admin']);
diff --git a/app/View/Elements/footer.ctp b/app/View/Elements/footer.ctp
index 919a4ea40..27cded50f 100644
--- a/app/View/Elements/footer.ctp
+++ b/app/View/Elements/footer.ctp
@@ -14,7 +14,7 @@
 			<div class = "footerText footerCenterText">
 				<?php 
 					$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>
 			</div>