From dd0aa8e10c4a736a891e5931eecb3b4aef9688c6 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Tue, 23 Feb 2010 13:33:51 +0000 Subject: [PATCH] syscp-trunk is f*cked --- admin_updates.php | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/admin_updates.php b/admin_updates.php index 5b954d76..1259d3da 100644 --- a/admin_updates.php +++ b/admin_updates.php @@ -27,15 +27,18 @@ if($page == 'overview') * has any version/dbversion in the database (don't know why) * so we have to set them both to run a correct upgrade */ - if (!isset($settings['panel']['version']) - || $settings['panel']['version'] == '' - ) { - $settings['panel']['version'] = '1.4.2.1'; - } - if (!isset($settings['system']['dbversion']) - || $settings['system']['dbversion'] == '' - ) { - $settings['system']['dbversion'] = 2; + if (!isFroxlor()) { + if (!isset($settings['panel']['version']) + || $settings['panel']['version'] == '' + ) { + $settings['panel']['version'] = '1.4.2.1'; + $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('panel','version','".$settings['panel']['version']."')"); + } + if (!isset($settings['system']['dbversion']) + || $settings['system']['dbversion'] == '' + ) { + $settings['system']['dbversion'] = 2; + } } if(hasUpdates($version))