merged from 14_STABLE -

removed incorrect global $USER

diff --git a/files/index.php b/files/index.php
index 889ce72e6dd914b4fc1e4760783810698d11b87e..35c5de5c53168384a45a881bbec5d32547bbc354 100644 (file)
--- a/files/index.php
+++ b/files/index.php
@@ -9,8 +9,6 @@
 
     require("../config.php");
 
-    global $USER;
-
     $id      = required_param('id', PARAM_INT);
     $file    = optional_param('file', '', PARAM_PATH);
     $wdir    = optional_param('wdir', '', PARAM_PATH);

diff --git a/mod/resource/coursefiles.php b/mod/resource/coursefiles.php
index 42c98dbc1cebfbfdaac74cdaad2ffbb2b15074fd..579b007a9abdbae7bcb39f10d4f86157c88d5cc2 100644 (file)
--- a/mod/resource/coursefiles.php
+++ b/mod/resource/coursefiles.php
@@ -13,8 +13,6 @@
     require("../../config.php");
     require("../../files/mimetypes.php");
 
-    global $USER;
-
     $id      = required_param('id', PARAM_INT);
     $file    = optional_param('file', '', PARAM_PATH);
     $wdir    = optional_param('wdir', '', PARAM_PATH);