bug #266

includes/account.php

@@ -1834,6 +1834,15 @@
 		$orgid = 0;
 	}
 
+	if($id == 36)
+	{
+		$row = mysql_fetch_assoc(mysql_query("select * from `alerts` where `memid`='".$_SESSION['profile']['id']."'"));
+		$_REQUEST['general'] = $row['general'];
+		$_REQUEST['country'] = $row['country'];
+		$_REQUEST['regional'] = $row['regional'];
+		$_REQUEST['radius'] = $row['radius'];
+	}
+
 	if($oldid == 36)
 	{
 		$rc = mysql_num_rows(mysql_query("select * from `alerts` where `memid`='".$_SESSION['profile']['id']."'"));
@@ -1856,15 +1865,6 @@
 		unset($oldid);
 	}
 
-	if($id == 36)
-	{
-		$row = mysql_fetch_assoc(mysql_query("select * from `alerts` where `memid`='".$_SESSION['profile']['id']."'"));
-		$_REQUEST['general'] = $row['general'];
-		$_REQUEST['country'] = $row['country'];
-		$_REQUEST['regional'] = $row['regional'];
-		$_REQUEST['radius'] = $row['radius'];
-	}
-
 	if($oldid == 41)
 	{
 		$lang = mysql_real_escape_string($_REQUEST['lang']);

includes/general.php

@@ -19,8 +19,8 @@
 	session_register("profile");
 	session_register("signup");
 	session_register("lostpw");
-	if($_SESSION['profile']['id'] > 0)
-		session_regenerate_id();
+//	if($_SESSION['profile']['id'] > 0)
+//		session_regenerate_id();
 
 	$junk = array(_("Face to Face Meeting"), _("Trusted Third Parties"), _("Thawte Points Transfer"), _("Administrative Increase"),
 			_("CT Magazine - Germany"), _("Temporary Increase"), _("Unknown"));