Merged from MOODLE_15_STABLE: Postgres doesn't happily convert NULL t…

…o 0 for int fields, so we set it manually. Credit: Patrick Li
moodle · Aug 2, 2005 · 67bbc9b · 67bbc9b
1 parent 168d73d
commit 67bbc9b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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");