From: tjhunt <tjhunt>
Date: Fri, 3 Aug 2007 10:33:29 +0000 (+0000)
Subject: MDL-10690 - Make quiz name a manditory field. Merged from MOODLE_18_STABLE.
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=99ebfea2471c1bd83fe3aa6fe38c779b4732f259;p=moodle.git

MDL-10690 - Make quiz name a manditory field. Merged from MOODLE_18_STABLE.
---

diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php
index cc6f6e650c..edcc3e4713 100644
--- a/mod/quiz/lib.php
+++ b/mod/quiz/lib.php
@@ -571,14 +571,7 @@ function quiz_process_options(&$quiz) {
         $quiz->preventlate = 0;
     }
 
-    // Quiz name. (Make up a default if one was not given.)
-    if (empty($quiz->name)) {
-        if (empty($quiz->intro)) {
-            $quiz->name = get_string('modulename', 'quiz');
-        } else {
-            $quiz->name = shorten_text(strip_tags($quiz->intro));
-        }
-    }
+    // Quiz name (now a required field).
     $quiz->name = trim($quiz->name);
 
     // Time limit. (Get rid of it if the checkbox was not ticked.)
diff --git a/mod/quiz/mod_form.php b/mod/quiz/mod_form.php
index b197e37462..588ca573ea 100644
--- a/mod/quiz/mod_form.php
+++ b/mod/quiz/mod_form.php
@@ -16,6 +16,7 @@ class mod_quiz_mod_form extends moodleform_mod {
 
         $mform->addElement('text', 'name', get_string('name'), array('size'=>'64'));
         $mform->setType('name', PARAM_TEXT);
+        $mform->addRule('name', null, 'required', null, 'client');
 
         $mform->addElement('htmleditor', 'intro', get_string("introduction", "quiz"));
         $mform->setType('intro', PARAM_RAW);