X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sql%2Falter2.2.php;h=cfc914aad4293703e2b7e70907d7267e88afba1c;hb=45a035785b9a820621da56dec93078b3ccd9832e;hp=457850ffc829a56a99b5b3d075718b7113a8774f;hpb=e3423fc85f1f3557ed45fefc8089afbf7d1a2731;p=fa-stable.git

diff --git a/sql/alter2.2.php b/sql/alter2.2.php
index 457850ff..cfc914aa 100644
--- a/sql/alter2.2.php
+++ b/sql/alter2.2.php
@@ -63,7 +63,7 @@ class fa2_2 {
 			if (db_num_rows($result)) {
 				while ($row = db_fetch($result)) {
 					$res2 = db_query("INSERT INTO {$pref}refs VALUES("
-						. $row['id'].",".$typeno.",'".addslashes($row['ref'])."')");
+						. $row['id'].",".$typeno.",".db_escape($row['ref']).")");
 					if (!$res2) {
 						display_error(_("Cannot copy references from $tbl")
 							.':<br>'. db_error_msg($db));
@@ -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.