Skip to content
Browse files

Merge branch 'MDL-20538' of git://github.com/timhunt/moodle

  • Loading branch information...
2 parents 355871a + 55190d7 commit a7b7c2d3db5fe0ad3acbbff1e9157a20cedd7afb Sam Hemelryk committed Jun 13, 2011
Showing with 48 additions and 20 deletions.
  1. +0 −16 lib/questionlib.php
  2. +21 −0 mod/lesson/format.php
  3. +1 −1 mod/quiz/db/upgradelib.php
  4. +24 −1 question/format.php
  5. +2 −2 question/type/randomsamatch/questiontype.php
View
16 lib/questionlib.php
@@ -41,22 +41,6 @@
/// CONSTANTS ///////////////////////////////////
-/**#@+
- * The core question types.
- */
-define("SHORTANSWER", "shortanswer");
-define("TRUEFALSE", "truefalse");
-define("MULTICHOICE", "multichoice");
-define("RANDOM", "random");
-define("MATCH", "match");
-define("RANDOMSAMATCH", "randomsamatch");
-define("DESCRIPTION", "description");
-define("NUMERICAL", "numerical");
-define("MULTIANSWER", "multianswer");
-define("CALCULATED", "calculated");
-define("ESSAY", "essay");
-/**#@-*/
-
/**
* Constant determines the number of answer boxes supplied in the editing
* form for multiple choice and similar question types.
View
21 mod/lesson/format.php
@@ -29,6 +29,27 @@
defined('MOODLE_INTERNAL') || die();
+/**#@+
+ * The core question types.
+ *
+ * These used to be in lib/questionlib.php, but are being deprecated. Copying them
+ * here to keep this code working for now.
+ */
+if (!defined('SHORTANSWER')) {
+ define("SHORTANSWER", "shortanswer");
+ define("TRUEFALSE", "truefalse");
+ define("MULTICHOICE", "multichoice");
+ define("RANDOM", "random");
+ define("MATCH", "match");
+ define("RANDOMSAMATCH", "randomsamatch");
+ define("DESCRIPTION", "description");
+ define("NUMERICAL", "numerical");
+ define("MULTIANSWER", "multianswer");
+ define("CALCULATED", "calculated");
+ define("ESSAY", "essay");
+}
+/**#@-*/
+
/**
* Given some question info and some data about the the answers
* this function parses, organises and saves the question
View
2 mod/quiz/db/upgradelib.php
@@ -49,7 +49,7 @@ function quiz_upgrade_very_old_question_sessions($attempt) {
// newgraded pointing to this state.
// Actually we only do this for states whose question is actually listed in $attempt->layout.
// We do not do it for states associated to wrapped questions like for example the questions
- // used by a RANDOM question
+ // used by a random question
$session = new stdClass();
$session->attemptid = $attempt->uniqueid;
$session->sumpenalty = 0;
View
25 question/format.php
@@ -27,6 +27,29 @@
defined('MOODLE_INTERNAL') || die();
+/**#@+
+ * The core question types.
+ *
+ * These used to be in lib/questionlib.php, but are being deprecated. Copying
+ * them here to keep the import/export code working for now (there are 135
+ * references to these constants which I don't want to try to fix at the moment.)
+ */
+if (!defined('SHORTANSWER')) {
+ define("SHORTANSWER", "shortanswer");
+ define("TRUEFALSE", "truefalse");
+ define("MULTICHOICE", "multichoice");
+ define("RANDOM", "random");
+ define("MATCH", "match");
+ define("RANDOMSAMATCH", "randomsamatch");
+ define("DESCRIPTION", "description");
+ define("NUMERICAL", "numerical");
+ define("MULTIANSWER", "multianswer");
+ define("CALCULATED", "calculated");
+ define("ESSAY", "essay");
+}
+/**#@-*/
+
+
/**
* Base class for question import and export formats.
*
@@ -697,7 +720,7 @@ public function exportprocess() {
}
// do not export random questions
- if ($question->qtype==RANDOM) {
+ if ($question->qtype == 'random') {
continue;
}
View
4 question/type/randomsamatch/questiontype.php
@@ -116,7 +116,7 @@ public function create_session_and_responses(&$question, &$state, $cmoptions, $a
available for this question, therefore it is not available in this
quiz. Please inform your teacher.";
// Treat this as a description from this point on
- $question->qtype = DESCRIPTION;
+ $question->qtype = 'description';
return true;
}
@@ -174,7 +174,7 @@ function restore_session_and_responses(&$question, &$state) {
available for this question, therefore it is not available in this
quiz. Please inform your teacher.";
// Treat this as a description from this point on
- $question->qtype = DESCRIPTION;
+ $question->qtype = 'description';
} else {
$responses = explode(',', $state->responses['']);
$responses = array_map(create_function('$val',

0 comments on commit a7b7c2d

Please sign in to comment.
Something went wrong with that request. Please try again.