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

fix duplicate db-updates due to new db-version stuff

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2016-03-15 17:14:41 +01:00
parent 104383d31e
commit a849f35469
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
admin_updates.php
View File

@@ -67,16 +67,16 @@ if ($page == 'overview') {
|| !isset($_POST['update_preconfig']) || !isset($_POST['update_preconfig'])
) { ) {
eval("echo \"" . getTemplate('update/update_start') . "\";"); eval("echo \"" . getTemplate('update/update_start') . "\";");
include_once './install/updatesql.php'; include_once './install/updatesql.php';
$redirect_url = 'admin_index.php?s=' . $s; $redirect_url = 'admin_index.php?s=' . $s;
eval("echo \"" . getTemplate('update/update_end') . "\";"); eval("echo \"" . getTemplate('update/update_end') . "\";");
updateCounters(); updateCounters();
inserttask('1'); inserttask('1');
@chmod('./lib/userdata.inc.php', 0440); @chmod('./lib/userdata.inc.php', 0440);
$successful_update = true; $successful_update = true;
} else { } else {
$message = '<br /><strong class="red">You have to agree that you have read the update notifications.</strong>'; $message = '<br /><strong class="red">You have to agree that you have read the update notifications.</strong>';
@@ -85,7 +85,7 @@ if ($page == 'overview') {
if (!$successful_update) { if (!$successful_update) {
$current_version = Settings::Get('panel.version'); $current_version = Settings::Get('panel.version');
$current_db_version = Settings::Get('panel.dbversion'); $current_db_version = Settings::Get('panel.db_version');
if (empty($current_db_version)) { if (empty($current_db_version)) {
$current_db_version = "0"; $current_db_version = "0";
} }

2
install/updates/froxlor/0.9/update_0.9.inc.php
View File

@@ -3145,7 +3145,7 @@ if (isFroxlorVersion('0.9.35-dev7')) {
updateToVersion('0.9.35-rc1'); updateToVersion('0.9.35-rc1');
} }
if (isFroxlorVersion('0.9.35-rc1')) { if (isFroxlorVersion('0.9.35-rc1') && isDatabaseVersion('0')) {
Settings::AddNew("panel.db_version", "201603070"); Settings::AddNew("panel.db_version", "201603070");