From 21d49a3f93e24f8dca99c0c339a60cc12eae778c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mudr=C3=A1k?= Date: Mon, 25 Jul 2016 19:30:30 +0200 Subject: [PATCH] MDL-55289 workshop: Include repository/lib.php to use its constants As a result of MDL-41556 (146893d6), the repository/lib.php was included in submission.php so that its constant FILE_INTERNAL could be used in field options. Recent development in MDL-50794 (996f7e8) moved the options declaration to standalone methods but we forgot to check they work in exsubmission.php too. This patch moves the repository/lib.php inclusion to where the library is actually needed. Additionally it unifies how options are set for overall feedback content and overall feedback attachment fields. --- mod/workshop/locallib.php | 11 +++++++++++ mod/workshop/submission.php | 1 - 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/mod/workshop/locallib.php b/mod/workshop/locallib.php index b26d56ac3f4..d074add47f8 100644 --- a/mod/workshop/locallib.php +++ b/mod/workshop/locallib.php @@ -2486,6 +2486,9 @@ class workshop { * @return array */ public function submission_content_options() { + global $CFG; + require_once($CFG->dirroot.'/repository/lib.php'); + return array( 'trusttext' => true, 'subdirs' => false, @@ -2502,6 +2505,8 @@ class workshop { * @return array */ public function submission_attachment_options() { + global $CFG; + require_once($CFG->dirroot.'/repository/lib.php'); $options = array( 'subdirs' => true, @@ -2523,12 +2528,16 @@ class workshop { * @return array */ public function overall_feedback_content_options() { + global $CFG; + require_once($CFG->dirroot.'/repository/lib.php'); + return array( 'subdirs' => 0, 'maxbytes' => $this->overallfeedbackmaxbytes, 'maxfiles' => $this->overallfeedbackfiles, 'changeformat' => 1, 'context' => $this->context, + 'return_types' => FILE_INTERNAL, ); } @@ -2538,6 +2547,8 @@ class workshop { * @return array */ public function overall_feedback_attachment_options() { + global $CFG; + require_once($CFG->dirroot.'/repository/lib.php'); $options = array( 'subdirs' => 1, diff --git a/mod/workshop/submission.php b/mod/workshop/submission.php index 3d7e1fb42e9..6fc9724465f 100644 --- a/mod/workshop/submission.php +++ b/mod/workshop/submission.php @@ -25,7 +25,6 @@ require(__DIR__.'/../../config.php'); require_once(__DIR__.'/locallib.php'); -require_once($CFG->dirroot . '/repository/lib.php'); $cmid = required_param('cmid', PARAM_INT); // Course module id. $id = optional_param('id', 0, PARAM_INT); // Submission id.