The information from question_rqp_types table should not be loaded every time questionlib.php is loaded but only when the questiontype menu is actually needed.

This commit is contained in:
gustav_delius 2006-04-26 20:29:32 +00:00
parent a2c0f03e5e
commit 50530eb782
2 changed files with 8 additions and 8 deletions

View File

@ -96,6 +96,13 @@ function question_list($course, $categoryid, $quizid=0,
$recurse=1, $page=0, $perpage=100, $showhidden=false, $sortorder='qtype, name ASC') {
global $QTYPE_MENU, $USER, $CFG;
$qtypemenu = $QTYPE_MENU;
if ($rqp_types = get_records('question_rqp_types')) {
foreach($rqp_types as $type) {
$qtypemenu['rqp_'.$type->id] = $type->name;
}
}
$strcategory = get_string("category", "quiz");
$strquestion = get_string("question", "quiz");
$straddquestions = get_string("addquestions", "quiz");
@ -143,7 +150,7 @@ function question_list($course, $categoryid, $quizid=0,
if (isteacheredit($category->course)) {
echo "<td valign=\"top\"><b>$strcreatenewquestion:</b></td>";
echo '<td valign="top" align="right">';
popup_form ("$CFG->wwwroot/question/question.php?category=$category->id&amp;qtype=", $QTYPE_MENU, "addquestion",
popup_form ("$CFG->wwwroot/question/question.php?category=$category->id&amp;qtype=", $qtypemenu, "addquestion",
"", "choose", "", "", false, "self");
echo '</td><td width="10" valign="top" align="right">';
helpbutton("questiontypes", $strcreatenewquestion, "quiz");

View File

@ -547,13 +547,6 @@ class question_rqp_qtype extends default_questiontype {
//////////////////////////////////////////////////////////////////////////
//// INITIATION - Without this line the question type is not in use... ///
//////////////////////////////////////////////////////////////////////////
// define("RQP", "11"); // already defined in questionlib.php
$QTYPES[RQP]= new question_rqp_qtype();
// The following adds the questiontype to the menu of types shown to teachers
if ($rqp_types = get_records('question_rqp_types')) {
foreach($rqp_types as $type) {
$QTYPE_MENU[100+$type->id] = $type->name;
}
}
?>