]> git.mjollnir.org Git - moodle.git/commitdiff
Merged fix from 1.6 for bug:
authorvyshane <vyshane>
Wed, 14 Jun 2006 08:47:19 +0000 (08:47 +0000)
committervyshane <vyshane>
Wed, 14 Jun 2006 08:47:19 +0000 (08:47 +0000)
Notice: Undefined property: id in /home/moodle/public_html/certificate/mod/forum/discuss.php on line 38

This happens when the user is not logged in and wants to view a forum of type
news.

mod/forum/discuss.php

index 5287edd0fd8a0062cab27e6f0351ed6ab5ab87b2..422546791cb86525ded2fc8826b4257e386f08fa 100644 (file)
@@ -35,7 +35,7 @@
     } elseif ($forum->type == "news") {
         if (!((isadmin() and !empty($CFG->admineditalways))
             || isteacher($course->id)
-            || $USER->id == $discussion->userid
+            || (!empty($USER->id) && $USER->id == $discussion->userid)
             || (($discussion->timestart == 0 || $discussion->timestart <= time())
             && ($discussion->timeend == 0 || $discussion->timeend > time())))) {
             error('Discussion ID was incorrect or no longer exists', "$CFG->wwwroot/mod/forum/view.php?f=$forum->id");