From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Fri, 23 Oct 2009 09:50:03 +0000 (+0000)
Subject: Fixed pre_check.
X-Git-Tag: v2.4.2~19^2~1090
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=bfd17863a94324dba8e9be74b03368cb3b3b5e98;p=fa-stable.git

Fixed pre_check.
---

diff --git a/sql/alter2.2.php b/sql/alter2.2.php
index cf417ce3..cfc914aa 100644
--- a/sql/alter2.2.php
+++ b/sql/alter2.2.php
@@ -103,7 +103,9 @@ class fa2_2 {
 		
 		if ($this->beta && !$force)
 			$this->sql = 'alter2.2rc.sql';
-		return $this->beta || !check_table($pref, 'usersonline');
+		// return ok when security groups still defined (upgrade from 2.1)
+		// or usersonline not defined (upgrade from 2.2 beta)
+		return isset($security_groups) || (check_table($pref, 'usersonline')!=0);
 	}
 	//
 	//	Test if patch was applied before.