Merge branch 'Add---Individual-Quiz-Runner' of https://github.com/AAU…

…-P5-Moodle/moodle-1 into Add---Individual-Quiz-Runner
AAU-P5-Moodle · Nov 8, 2024 · adc64d6 · adc64d6
2 parents 11243b5 + c99c61b
commit adc64d6
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 7 deletions.
diff --git a/server/apache/conf/extra/httpd-xampp.conf b/server/apache/conf/extra/httpd-xampp.conf
@@ -65,7 +65,7 @@ LoadModule php_module "C:/moodle-1/server/php/php8apache2_4.dll"
 #    </FilesMatch>
 #</Directory>
 
-#<Directory "C:/moodle-1/server/htdocsC:/moodle-1/server">
+#<Directory "C:/moodle-1/server/htdocs/xampp">
 #    <IfModule php_module>
 #    	<Files "status.php">
 #    		php_admin_flag safe_mode off

diff --git a/server/moodle/admin/tool/policy/amd/build/jquery-eu-cookie-law-popup.min.js.map b/server/moodle/admin/tool/policy/amd/build/jquery-eu-cookie-law-popup.min.js.map
diff --git a/server/moodle/mod/book/classes/output/main_action_menu.php b/server/moodle/mod/book/classes/output/main_action_menu.php
@@ -130,7 +130,7 @@ public function export_for_template(\renderer_base $output): array {
         $next = $this->get_next_chapter();
         $previous = $this->get_previous_chapter();
 
-        $context = \context_module::instance($this->cmid); //This is 
+        $context = \context_module::instance($this->cmid);
         $data = [];
 
         if ($next) {

diff --git a/server/moodle/mod/quiz/attempt.php b/server/moodle/mod/quiz/attempt.php
@@ -43,7 +43,7 @@
 // Get submitted parameters.
 $attemptid = required_param('attempt', PARAM_INT);
 $page = optional_param('page', 0, PARAM_INT);
-$cmid = optional_param('cmid', null, PARAM_INT); 
+$cmid = optional_param('cmid', null, PARAM_INT);
 
 $attemptobj = quiz_create_attempt_handling_errors($attemptid, $cmid);
 $page = $attemptobj->force_page_number_into_range($page);

diff --git a/server/moodle/question/format.php b/server/moodle/question/format.php
@@ -329,9 +329,6 @@ public function importpreprocess() {
     }
 
     /**
-     * Process the file
-     * This method should not normally be overidden
-     * @re/**
      * Process the file
      * This method should not normally be overidden
      * @return bool success