From: agrabs <agrabs>
Date: Sun, 16 Nov 2008 20:48:08 +0000 (+0000)
Subject: MDL-17249 - feedbacks on the mainsite are not accessible
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=58627682fa3d21baa4a5c99027bb8ca74bb49a2b;p=moodle.git

MDL-17249 - feedbacks on the mainsite are not accessible
---

diff --git a/mod/feedback/complete.php b/mod/feedback/complete.php
index 66fd68a214..2d360fd4ad 100644
--- a/mod/feedback/complete.php
+++ b/mod/feedback/complete.php
@@ -75,6 +75,11 @@
         $capabilities->complete = true;
     }
     
+    //check whether the feedback is located and! started from the mainsite
+    if($course->id == SITEID AND !$courseid) {
+        $courseid = SITEID;
+    }
+    
     //check whether the feedback is mapped to the given courseid
     if($course->id == SITEID AND !$capabilities->edititems) {
         if($DB->get_records('feedback_sitecourse_map', array('feedbackid'=>$feedback->id))) {
@@ -83,11 +88,6 @@
             }
         }
     }
-    
-    //check whether the feedback is located and! started from the mainsite
-    if($course->id == SITEID AND !$courseid) {
-        $courseid = SITEID;
-    }
         
     if($feedback->anonymous != FEEDBACK_ANONYMOUS_YES) {
         if($course->id == SITEID) {
diff --git a/mod/feedback/version.php b/mod/feedback/version.php
index 7e4d01f694..5159844661 100644
--- a/mod/feedback/version.php
+++ b/mod/feedback/version.php
@@ -10,7 +10,7 @@
 */
 
    
-    $module->version = 2008073002; // The current module version (Date: YYYYMMDDXX)
+    $module->version = 2008073003; // The current module version (Date: YYYYMMDDXX)
     $module->requires = 2008072401;  // Requires this Moodle version
     $feedback_version_intern = 1; //this version is used for restore older backups
     $module->cron = 0; // Period for cron to check this module (secs)
diff --git a/mod/feedback/view.php b/mod/feedback/view.php
index f774e796f8..33b9e34dbc 100644
--- a/mod/feedback/view.php
+++ b/mod/feedback/view.php
@@ -36,6 +36,11 @@
         $capabilities->complete = true;
     }
     
+    //check whether the feedback is located and! started from the mainsite
+    if($course->id == SITEID AND !$courseid) {
+        $courseid = SITEID;
+    }
+    
     //check whether the feedback is mapped to the given courseid
     if($course->id == SITEID AND !$capabilities->edititems) {
         if($DB->get_records('feedback_sitecourse_map', array('feedbackid'=>$feedback->id))) {
@@ -45,11 +50,6 @@
         }
     }
     
-    //check whether the feedback is located and! started from the mainsite
-    if($course->id == SITEID AND !$courseid) {
-        $courseid = SITEID;
-    }
-    
     if($feedback->anonymous != FEEDBACK_ANONYMOUS_YES) {
         if($course->id == SITEID) {
             require_login($course->id, true);