maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

don't show 'there is a newer version of froxlor available' if a customzied (unknown) version is being checked

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-12-12 11:20:19 +01:00
parent 73f5547a5e
commit 8516cbb64d
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
admin_index.php
View File

@@ -108,7 +108,12 @@ if ($page == 'overview') {
$lookfornewversion_link = $_link; $lookfornewversion_link = $_link;
$lookfornewversion_addinfo = $_message; $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; $isnewerversion = 1;
} else { } else {
$isnewerversion = 0; $isnewerversion = 0;

2
templates/Froxlor/admin/index/index.tpl
View File

@@ -141,7 +141,7 @@ $header
<td><a href="$lookfornewversion_link">$lookfornewversion_lable</a></td> <td><a href="$lookfornewversion_link">$lookfornewversion_lable</a></td>
</if> </if>
</tr> </tr>
<if $isnewerversion != 0 > <if $isnewerversion == 1 >
<tr> <tr>
<td colspan="2"><strong>{$lng['admin']['newerversionavailable']}</strong></td> <td colspan="2"><strong>{$lng['admin']['newerversionavailable']}</strong></td>
</tr> </tr>

2
templates/Sparkle/admin/index/index.tpl vendored
View File

@@ -265,7 +265,7 @@ $header
<td><a href="$lookfornewversion_link">$lookfornewversion_lable</a></td> <td><a href="$lookfornewversion_link">$lookfornewversion_lable</a></td>
</if> </if>
</tr> </tr>
<if $isnewerversion != 0 > <if $isnewerversion == 1 >
<tr> <tr>
<td colspan="2"><strong>{$lng['admin']['newerversionavailable']}</strong></td> <td colspan="2"><strong>{$lng['admin']['newerversionavailable']}</strong></td>
</tr> </tr>