From: skodak <skodak>
Date: Sat, 21 Oct 2006 20:42:50 +0000 (+0000)
Subject: fix has_capability() to work when $nomoodlecookie = true; MDL-7156 - needed for RSS... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=013f2e7cd9c26892b4b79371522b3c8452720172;p=moodle.git

fix has_capability() to work when $nomoodlecookie = true; MDL-7156 - needed for RSS file.php that is serving feeds; merged from MOODLE_17_STABLE
---

diff --git a/lib/accesslib.php b/lib/accesslib.php
index aa8735492d..b35ec3b0c2 100755
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -284,7 +284,7 @@ function has_capability($capability, $context=NULL, $userid=NULL, $doanything=tr
         }
     }
 
-    if ($userid && $userid != $USER->id) {
+    if ($userid && (($USER === NULL) or ($userid != $USER->id))) {
         if (empty($USER->id) or ($userid != $USER->id)) {
             $capabilities = load_user_capability($capability, $context, $userid);
         } else { //$USER->id == $userid