Merged bug fix for MDL-6325

diff --git a/mod/lesson/import.php b/mod/lesson/import.php
index 5a22e7443e99279d54d4f2c6eefae775523112eb..c78f32ed137a55b3a0855d37a71697753d844e27 100644 (file)
--- a/mod/lesson/import.php
+++ b/mod/lesson/import.php
@@ -4,6 +4,7 @@
     require_once("../../config.php");
     require_once("lib.php");
     require_once("locallib.php");
+    require_once($CFG->libdir.'/questionlib.php');
 
     $id     = required_param('id', PARAM_INT);         // Course Module ID
     $pageid = optional_param('pageid', '', PARAM_INT); // Page ID
@@ -51,7 +52,6 @@
             }
 
             require("format.php");  // Parent class
-            require("$CFG->libdir/questionlib.php"); // for the constants used in quiz/format/<format>/format.php
             require("$CFG->dirroot/question/format/$form->format/format.php");
 
             $classname = "qformat_$form->format";
@@ -78,17 +78,7 @@
 
     /// Print upload form
 
-    $fileformats = get_list_of_plugins('question/format');
-    $fileformatnames = array();
-    foreach ($fileformats as $key => $fileformat) {
-        $formatname = get_string($fileformat, 'lesson');
-        if ($formatname == "[[$fileformat]]") {
-            $formatname = $fileformat;  // Just use the raw folder name
-        }
-        $fileformatnames[$fileformat] = $formatname;
-    }
-    natcasesort($fileformatnames);
-
+    $fileformatnames = get_import_export_formats('import');
 
     print_heading_with_help($strimportquestions, "import", "lesson");