From 67bbc9b7de1f661e3e5d5dc6fe5ff048dc280dc9 Mon Sep 17 00:00:00 2001 From: mjollnir_ Date: Tue, 2 Aug 2005 22:48:20 +0000 Subject: [PATCH] Merged from MOODLE_15_STABLE: Postgres doesn't happily convert NULL to 0 for int fields, so we set it manually. Credit: Patrick Li --- mod/forum/subscribe.php | 2 +- mod/forum/view.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mod/forum/subscribe.php b/mod/forum/subscribe.php index 455f77a5dff..ef65d5b4bc2 100644 --- a/mod/forum/subscribe.php +++ b/mod/forum/subscribe.php @@ -24,7 +24,7 @@ } } } else { - $cm->id = NULL; + $cm->id = 0; } if ($user) { diff --git a/mod/forum/view.php b/mod/forum/view.php index 4f75718b4e4..f63d6aa98f0 100644 --- a/mod/forum/view.php +++ b/mod/forum/view.php @@ -42,7 +42,7 @@ if ($cm = get_coursemodule_from_instance("forum", $forum->id, $course->id)) { $buttontext = update_module_button($cm->id, $course->id, $strforum); } else { - $cm->id = NULL; + $cm->id = 0; $cm->visible = 1; $cm->course = $course->id; $buttontext = ""; @@ -66,7 +66,7 @@ } } - if ($cm) { + if ($cm->id) { add_to_log($course->id, "forum", "view forum", "view.php?id=$cm->id", "$forum->id", $cm->id); } else { add_to_log($course->id, "forum", "view forum", "view.php?f=$forum->id", "$forum->id");