diff --git a/mod/hotpot/db/mysql.php b/mod/hotpot/db/mysql.php
index a867684f77b..bf4234dcbd6 100644
--- a/mod/hotpot/db/mysql.php
+++ b/mod/hotpot/db/mysql.php
@@ -1,43 +1,43 @@
-<?PHP
-function hotpot_upgrade($oldversion) {
-	global $CFG;
-	$ok = true;
-
-	if ($oldversion < 2004021400) {
-		execute_sql(" ALTER TABLE `{$CFG->prefix}hotpot_events` ADD `starttime` INT(10) unsigned NOT NULL DEFAULT '0' AFTER `time`");
-		execute_sql(" ALTER TABLE `{$CFG->prefix}hotpot_events` ADD `endtime` INT(10) unsigned NOT NULL DEFAULT '0' AFTER `time`");
-	}
-
-	// set path to update functions
-	$update_to_v2 = "$CFG->dirroot/mod/hotpot/db/update_to_v2.php";
-
-	// update from HotPot v1 to HotPot v2
-	if ($oldversion < 2005031400) {
-		require_once $update_to_v2;
-		$ok = $ok && hotpot_update_to_v2_from_v1();
-	}
-	if ($oldversion < 2005090700) {
-		require_once $update_to_v2;
-		$ok = $ok && hotpot_update_to_v2_1();
-	}
-	if ($oldversion > 2005031419 && $oldversion < 2005090702) {
-		// update to from HotPot v2.1.0 or v2.1.1
-		require_once $update_to_v2;
-		$ok = $ok && hotpot_update_to_v2_1_2();
-	}
-	if ($oldversion < 2006042103) {
-		require_once $update_to_v2;
-		$ok = $ok && hotpot_update_to_v2_1_16();
-	}
-	if ($oldversion < 2006042601) {
-		require_once $update_to_v2;
-		$ok = $ok && hotpot_update_to_v2_1_17();
-	}
-	if ($oldversion < 2006042800) {
-		require_once $update_to_v2;
-		$ok = $ok && hotpot_update_to_v2_1_18();
-	}
-
-	return $ok;
-}
-?>
+<?PHP
+function hotpot_upgrade($oldversion) {
+	global $CFG;
+	$ok = true;
+
+	if ($oldversion < 2004021400) {
+		execute_sql(" ALTER TABLE `{$CFG->prefix}hotpot_events` ADD `starttime` INT(10) unsigned NOT NULL DEFAULT '0' AFTER `time`");
+		execute_sql(" ALTER TABLE `{$CFG->prefix}hotpot_events` ADD `endtime` INT(10) unsigned NOT NULL DEFAULT '0' AFTER `time`");
+	}
+
+	// set path to update functions
+	$update_to_v2 = "$CFG->dirroot/mod/hotpot/db/update_to_v2.php";
+
+	// update from HotPot v1 to HotPot v2
+	if ($oldversion < 2005031400) {
+		require_once $update_to_v2;
+		$ok = $ok && hotpot_update_to_v2_from_v1();
+	}
+	if ($oldversion < 2005090700) {
+		require_once $update_to_v2;
+		$ok = $ok && hotpot_update_to_v2_1();
+	}
+	if ($oldversion > 2005031419 && $oldversion < 2005090702) {
+		// update to from HotPot v2.1.0 or v2.1.1
+		require_once $update_to_v2;
+		$ok = $ok && hotpot_update_to_v2_1_2();
+	}
+	if ($oldversion < 2006042103) {
+		require_once $update_to_v2;
+		$ok = $ok && hotpot_update_to_v2_1_16();
+	}
+	if ($oldversion < 2006042601) {
+		require_once $update_to_v2;
+		$ok = $ok && hotpot_update_to_v2_1_17();
+	}
+	if ($oldversion < 2006042801) {
+		require_once $update_to_v2;
+		$ok = $ok && hotpot_update_to_v2_1_18();
+	}
+
+	return $ok;
+}
+?>
diff --git a/mod/hotpot/db/postgres7.php b/mod/hotpot/db/postgres7.php
index ac898bc32ff..63baf900d8e 100644
--- a/mod/hotpot/db/postgres7.php
+++ b/mod/hotpot/db/postgres7.php
@@ -1,46 +1,46 @@
-<?PHP
-function hotpot_upgrade($oldversion) {
-	global $CFG;
-	$ok = true;
-
-	// set path to update functions
-	$update_to_v2 = "$CFG->dirroot/mod/hotpot/db/update_to_v2.php";
-
-	// update from HotPot v1 to HotPot v2
-	if ($oldversion < 2005031400) {
-		require_once $update_to_v2;
-		$ok = $ok && hotpot_update_to_v2_from_v1();
-	}
-	// update to HotPot v2.1
-	if ($oldversion < 2005090700) {
-		require_once $update_to_v2;
-		$ok = $ok && hotpot_update_to_v2_1();
-	}
-	if ($oldversion > 2005031419 && $oldversion < 2005090702) {
-		// update to from HotPot v2.1.0 or v2.1.1
-		require_once $update_to_v2;
-		$ok = $ok && hotpot_update_to_v2_1_2();
-	}
-	if ($oldversion < 2005090706) {
-		require_once $update_to_v2;
-		$ok = $ok && hotpot_update_to_v2_1_6();
-	}
-	if ($oldversion < 2005090708) {
-		require_once $update_to_v2;
-		$ok = $ok && hotpot_update_to_v2_1_8();
-	}
-	if ($oldversion < 2006042103) {
-		require_once $update_to_v2;
-		$ok = $ok && hotpot_update_to_v2_1_16();
-	}
-	if ($oldversion < 2006042602) {
-		require_once $update_to_v2;
-		$ok = $ok && hotpot_update_to_v2_1_17();
-	}
-	if ($oldversion < 2006042800) {
-		require_once $update_to_v2;
-		$ok = $ok && hotpot_update_to_v2_1_18();
-	}
-	return $ok;
-}
-?>
+<?PHP
+function hotpot_upgrade($oldversion) {
+	global $CFG;
+	$ok = true;
+
+	// set path to update functions
+	$update_to_v2 = "$CFG->dirroot/mod/hotpot/db/update_to_v2.php";
+
+	// update from HotPot v1 to HotPot v2
+	if ($oldversion < 2005031400) {
+		require_once $update_to_v2;
+		$ok = $ok && hotpot_update_to_v2_from_v1();
+	}
+	// update to HotPot v2.1
+	if ($oldversion < 2005090700) {
+		require_once $update_to_v2;
+		$ok = $ok && hotpot_update_to_v2_1();
+	}
+	if ($oldversion > 2005031419 && $oldversion < 2005090702) {
+		// update to from HotPot v2.1.0 or v2.1.1
+		require_once $update_to_v2;
+		$ok = $ok && hotpot_update_to_v2_1_2();
+	}
+	if ($oldversion < 2005090706) {
+		require_once $update_to_v2;
+		$ok = $ok && hotpot_update_to_v2_1_6();
+	}
+	if ($oldversion < 2005090708) {
+		require_once $update_to_v2;
+		$ok = $ok && hotpot_update_to_v2_1_8();
+	}
+	if ($oldversion < 2006042103) {
+		require_once $update_to_v2;
+		$ok = $ok && hotpot_update_to_v2_1_16();
+	}
+	if ($oldversion < 2006042602) {
+		require_once $update_to_v2;
+		$ok = $ok && hotpot_update_to_v2_1_17();
+	}
+	if ($oldversion < 2006042801) {
+		require_once $update_to_v2;
+		$ok = $ok && hotpot_update_to_v2_1_18();
+	}
+	return $ok;
+}
+?>
diff --git a/mod/hotpot/db/update_to_v2.php b/mod/hotpot/db/update_to_v2.php
index 3d2cba9a493..d5b33eaa427 100644
--- a/mod/hotpot/db/update_to_v2.php
+++ b/mod/hotpot/db/update_to_v2.php
@@ -12,7 +12,7 @@ function hotpot_update_to_v2_1_18() {
 
 	return $ok;
 }
-function hotpot_remove_orphans($secondarytable, $secondarykeyfield, $primarytable, $primarykeyfield='id') {
+function hotpot_remove_orphans($secondarytable, $secondarykeyfield, $primarytable) {
 	global $CFG,$db;
 	$ok = true;
 
@@ -22,14 +22,14 @@ function hotpot_remove_orphans($secondarytable, $secondarykeyfield, $primarytabl
 
 	$records = get_records_sql("
 		SELECT 
-			t2.$secondarykeyfield, t2.$secondarykeyfield
+			t2.id, t2.id
 		FROM 
 			{$CFG->prefix}$secondarytable AS t2 LEFT JOIN {$CFG->prefix}$primarytable AS t1 
-			ON (t2.$secondarykeyfield = t1.$primarykeyfield)
+			ON (t2.$secondarykeyfield = t1.id)
 		WHERE 
-			t1.$primarykeyfield IS NULL
+			t1.id IS NULL
 		ORDER BY 
-			t2.$secondarykeyfield
+			t2.id
 	");
 
 	// restore SQL message echo setting
@@ -37,7 +37,7 @@ function hotpot_remove_orphans($secondarytable, $secondarykeyfield, $primarytabl
 
 	if ($records) {
 		$ids = implode(',', array_keys($records));
-		print 'removing '.count($ids).' orphan record(s) from {$CFG->prefix}$secondarytable (key=$secondarykeyfield) ...<br>';
+		print 'removing '.count($records)." orphan record(s) from {$CFG->prefix}$secondarytable<br>";
 		$ok = $ok && execute_sql("DELETE FROM {$CFG->prefix}$secondarytable WHERE $secondarykeyfield IN ($ids)");
 	}
 
@@ -71,7 +71,7 @@ function hotpot_denull_int_field($table, $field, $size) {
 	global $CFG;
 	$ok = true;
 
-	$ok = $ok && execute_sql("UPDATE {$CFG->prefix}$table SET $field=0 WHERE $field IS NULL");
+	$ok = $ok && execute_sql("UPDATE {$CFG->prefix}$table SET $field=0 WHERE $field IS NULL", false);
 	$ok = $ok && hotpot_db_update_field_type($table, $field, $field, 'INTEGER', $size, 'UNSIGNED', 'NOT NULL', 0);
 
 	return $ok;
diff --git a/mod/hotpot/version.php b/mod/hotpot/version.php
index 25644e89253..b8bfff228ca 100644
--- a/mod/hotpot/version.php
+++ b/mod/hotpot/version.php
@@ -3,7 +3,7 @@
 ///  Code fragment to define the version of hotpot
 ///  This fragment is called by moodle_needs_upgrading() and /admin/index.php
 /////////////////////////////////////////////////////////////////////////////////
-$module->version  = 2006042800;  // release date of this version (see note below)
+$module->version  = 2006042801;  // release date of this version (see note below)
 $module->release  = 'v2.1.18';    // human-friendly version name (used in mod/hotpot/lib.php)
 $module->cron     = 0;           // period for cron to check this module (secs)
 // interpretation of YYYYMMDDXY version numbers