From: vyshane <vyshane>
Date: Wed, 14 Jun 2006 08:47:19 +0000 (+0000)
Subject: Merged fix from 1.6 for bug:
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=883f4e3dc6c8ef0fcc60c7e9ea1640a0906f2591;p=moodle.git

Merged fix from 1.6 for bug:

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.
---

diff --git a/mod/forum/discuss.php b/mod/forum/discuss.php
index 5287edd0fd..422546791c 100644
--- a/mod/forum/discuss.php
+++ b/mod/forum/discuss.php
@@ -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");