From: skodak <skodak>
Date: Mon, 2 Apr 2007 16:13:41 +0000 (+0000)
Subject: MDL-9168 nested site policy when forcelogin enabled; merged from MOODLE_18_STABLE
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=90a32fd5e670b09c0c10b3b314ee02f8c3e0cf6d;p=moodle.git

MDL-9168 nested site policy when forcelogin enabled; merged from MOODLE_18_STABLE
---

diff --git a/file.php b/file.php
index 3191ac715c..d047f9d96c 100644
--- a/file.php
+++ b/file.php
@@ -64,7 +64,13 @@
     } else if ($course->id != SITEID) {
         require_login($course->id);
     } else if ($CFG->forcelogin) {
-        require_login();
+        if (!empty($CFG->sitepolicy)
+            and ($CFG->sitepolicy == $CFG->wwwroot.'/file.php'.$relativepath
+                 or $CFG->sitepolicy == $CFG->wwwroot.'/file.php?file='.$relativepath)) {
+            //do not require login for policy file
+        } else {
+            require_login();
+        }
     }
 
     // security: only editing teachers can access backups