From 9ef238bc84af5a1c5f651e37157d3646706b978f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mudr=C3=A1k?= Date: Tue, 4 Jul 2017 11:00:52 +0200 Subject: [PATCH] MDL-56486 workshop: Use filetypes utility class to normalize file types --- mod/workshop/lib.php | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/mod/workshop/lib.php b/mod/workshop/lib.php index 635774d02d3..0433bb26d02 100644 --- a/mod/workshop/lib.php +++ b/mod/workshop/lib.php @@ -95,11 +95,15 @@ function workshop_add_instance(stdclass $workshop) { } if (isset($workshop->submissionfiletypes)) { - $workshop->submissionfiletypes = workshop::clean_file_extensions($workshop->submissionfiletypes); + $filetypesutil = new \core_form\filetypes_util(); + $submissionfiletypes = $filetypesutil->normalize_file_types($workshop->submissionfiletypes); + $workshop->submissionfiletypes = implode(' ', $submissionfiletypes); } if (isset($workshop->overallfeedbackfiletypes)) { - $workshop->overallfeedbackfiletypes = workshop::clean_file_extensions($workshop->overallfeedbackfiletypes); + $filetypesutil = new \core_form\filetypes_util(); + $overallfeedbackfiletypes = $filetypesutil->normalize_file_types($workshop->overallfeedbackfiletypes); + $workshop->overallfeedbackfiletypes = implode(' ', $overallfeedbackfiletypes); } // insert the new record so we get the id @@ -171,11 +175,15 @@ function workshop_update_instance(stdclass $workshop) { } if (isset($workshop->submissionfiletypes)) { - $workshop->submissionfiletypes = workshop::clean_file_extensions($workshop->submissionfiletypes); + $filetypesutil = new \core_form\filetypes_util(); + $submissionfiletypes = $filetypesutil->normalize_file_types($workshop->submissionfiletypes); + $workshop->submissionfiletypes = implode(' ', $submissionfiletypes); } if (isset($workshop->overallfeedbackfiletypes)) { - $workshop->overallfeedbackfiletypes = workshop::clean_file_extensions($workshop->overallfeedbackfiletypes); + $filetypesutil = new \core_form\filetypes_util(); + $overallfeedbackfiletypes = $filetypesutil->normalize_file_types($workshop->overallfeedbackfiletypes); + $workshop->overallfeedbackfiletypes = implode(' ', $overallfeedbackfiletypes); } // todo - if the grading strategy is being changed, we may want to replace all aggregated peer grades with nulls