From 8516cbb64da5be3997ab4b9a1d9ccaeca73f9208 Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Thu, 12 Dec 2013 11:20:19 +0100
Subject: [PATCH] don't show 'there is a newer version of froxlor available' if
 a customzied (unknown) version is being checked

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
---
 admin_index.php                         | 7 ++++++-
 templates/Froxlor/admin/index/index.tpl | 2 +-
 templates/Sparkle/admin/index/index.tpl | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/admin_index.php b/admin_index.php
index 668edf90..85801d35 100644
--- a/admin_index.php
+++ b/admin_index.php
@@ -108,7 +108,12 @@ if ($page == 'overview') {
 					$lookfornewversion_link = $_link;
 					$lookfornewversion_addinfo = $_message;
 
-					if (version_compare2($version, $_version) == -1) {
+					// not numeric -> error-message
+					if (!is_numeric($_version)) {
+						// check for customized version to not output
+						// "There is a newer version of froxlor" besides the error-message
+						$isnewerversion = 2;
+					} elseif (version_compare2($version, $_version) == -1) {
 						$isnewerversion = 1;
 					} else {
 						$isnewerversion = 0;
diff --git a/templates/Froxlor/admin/index/index.tpl b/templates/Froxlor/admin/index/index.tpl
index a75ce883..a3af5f6f 100644
--- a/templates/Froxlor/admin/index/index.tpl
+++ b/templates/Froxlor/admin/index/index.tpl
@@ -141,7 +141,7 @@ $header
 				<td><a href="$lookfornewversion_link">$lookfornewversion_lable</a></td>
 			</if>
 		</tr>
-		<if $isnewerversion != 0 >
+		<if $isnewerversion == 1 >
 		<tr>
 			<td colspan="2"><strong>{$lng['admin']['newerversionavailable']}</strong></td>
 		</tr>
diff --git a/templates/Sparkle/admin/index/index.tpl b/templates/Sparkle/admin/index/index.tpl
index 2bb5453c..efc0344e 100644
--- a/templates/Sparkle/admin/index/index.tpl
+++ b/templates/Sparkle/admin/index/index.tpl
@@ -265,7 +265,7 @@ $header
 				<td><a href="$lookfornewversion_link">$lookfornewversion_lable</a></td>
 			</if>
 		</tr>
-		<if $isnewerversion != 0 >
+		<if $isnewerversion == 1 >
 		<tr>
 			<td colspan="2"><strong>{$lng['admin']['newerversionavailable']}</strong></td>
 		</tr>