Merge pull request #842 from Oldiesmann/release-2.1

! Make sure to change variable names when copying code... (Fixes #828)

other/upgrade_2-1_mysql.sql

@@ -518,7 +518,7 @@ $request = upgrade_query("
 	FROM {$db_prefix}permissions
 	WHERE permission = 'profile_identity_own'");
 	
-	while ($row = $smcFunc['db_fetch_assoc']($get_questions))
+	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		$inserts[] = "($row[id_group], 'profile_password_own', $row[add_deny])";
 	}
@@ -546,7 +546,7 @@ $request = upgrade_query("
 	FROM {$db_prefix}permissions
 	WHERE permission = 'profile_extra_own'");
 	
-	while ($row = $smcFunc['db_fetch_assoc']($get_questions))
+	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		$inserts[] = "($row[id_group], 'profile_blurb_own', $row[add_deny])";
 		$inserts[] = "($row[id_group], 'profile_displayed_name_own', $row[add_deny])";

other/upgrade_2-1_postgresql.sql

@@ -592,7 +592,7 @@ $request = upgrade_query("
 	FROM {$db_prefix}permissions
 	WHERE permission = 'profile_identity_own'");
 	
-	while ($row = $smcFunc['db_fetch_assoc']($get_questions))
+	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		$inserts[] = "($row[id_group], 'profile_password_own', $row[add_deny])";
 	}
@@ -622,7 +622,7 @@ $request = upgrade_query("
 	FROM {$db_prefix}permissions
 	WHERE permission = 'profile_extra_own'");
 	
-	while ($row = $smcFunc['db_fetch_assoc']($get_questions))
+	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		$inserts[] = "($row[id_group], 'profile_blurb_own', $row[add_deny])";
 		$inserts[] = "($row[id_group], 'profile_displayed_name_own', $row[add_deny])";

other/upgrade_2-1_sqlite.sql

@@ -575,7 +575,7 @@ $request = upgrade_query("
 	FROM {$db_prefix}permissions
 	WHERE permission = 'profile_identity_own'");
 	
-	while ($row = $smcFunc['db_fetch_assoc']($get_questions))
+	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		$inserts[] = "($row[id_group], 'profile_password_own', $row[add_deny])";
 	}
@@ -605,7 +605,7 @@ $request = upgrade_query("
 	FROM {$db_prefix}permissions
 	WHERE permission = 'profile_extra_own'");
 	
-	while ($row = $smcFunc['db_fetch_assoc']($get_questions))
+	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		$inserts[] = "($row[id_group], 'profile_blurb_own', $row[add_deny])";
 		$inserts[] = "($row[id_group], 'profile_displayed_name_own', $row[add_deny])";