Fixed pre_check.

diff --git a/sql/alter2.2.php b/sql/alter2.2.php
index cf417ce3ffcd8b027f3250e89840df21c8c6624e..cfc914aad4293703e2b7e70907d7267e88afba1c 100644 (file)
--- 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.