commit 0bbbfdf728ed9a4097017e506a81724d40e9882c Author: Fanmail Administrator Date: Mon Feb 25 15:17:02 2013 -0600 fix Notice: Undefined index: und in several quiz files diff --git a/question_types/quiz_question/quiz_question.module b/question_types/quiz_question/quiz_question.module index 9cecece..07502bb 100644 --- a/question_types/quiz_question/quiz_question.module +++ b/question_types/quiz_question/quiz_question.module @@ -317,8 +317,9 @@ function quiz_question_list_questions($count = 0, $offset = 0) { * From where is this function invoked? */ $questions = array(); + $question_format = (isset ($question->body[LANGUAGE_NONE][0]['format'])) ? $question->body[LANGUAGE_NONE][0]['format'] : NULL ; while ($question = $query->fetch()) { - $question->question = check_markup($question->body, $question->body[LANGUAGE_NONE][0]['format']); + $question->question = check_markup($question->body, $question_format); $questions[] = $question; } return $questions; diff --git a/quiz.admin.inc b/quiz.admin.inc index f3cb084..b764e60 100644 --- a/quiz.admin.inc +++ b/quiz.admin.inc @@ -1785,11 +1785,12 @@ function theme_quiz_admin_summary($variables) { $params = array('%num_correct' => $score['numeric_score'], '%question_count' => $score['possible_score']); $output .= '
' . t('This person got %num_correct of %question_count possible points.', $params) . '
' . "\n"; $output .= '
' . t('Total score: @score %', array('@score' => $score['percentage_score'])) . '
' . "\n"; + $quiz_format = (isset ($quiz->body[LANGUAGE_NONE][0]['format'])) ? $quiz->body[LANGUAGE_NONE][0]['format'] : NULL ; if (isset($summary['passfail'])) { - $output .= '
' . check_markup($summary['passfail'], $quiz->body[LANGUAGE_NONE][0]['format']) . '
' . "\n"; + $output .= '
' . check_markup($summary['passfail'], $quiz_format) . '
' . "\n"; } if (isset($summary['result'])) { - $output .= '
' . check_markup($summary['result'], $quiz->body[LANGUAGE_NONE][0]['format']) . '
' . "\n"; + $output .= '
' . check_markup($summary['result'], $quiz_format) . '
' . "\n"; } // Get the feedback for all questions. diff --git a/quiz.module b/quiz.module index 0731494..0b4eeea 100644 --- a/quiz.module +++ b/quiz.module @@ -3012,7 +3012,8 @@ function _quiz_get_terms($vid) { function quiz_node_map($node, $include_question = TRUE) { $new_question = new stdClass(); if ($include_question) { - $new_question->question = check_markup($node->body, $node->body[LANGUAGE_NONE][0]['format']); + $quiz_format = (isset ($node->body[LANGUAGE_NONE][0]['format'])) ? $node->body[LANGUAGE_NONE][0]['format'] : NULL ; + $new_question->question = check_markup($node->body, $quiz_format); } $new_question->title = $node->title; $new_question->nid = $node->nid; @@ -3325,10 +3326,11 @@ function _quiz_update_resultoptions($node) { */ function _quiz_get_summary_text($quiz, $score) { $summary = array(); $admin = (arg(0) == 'admin'); + $quiz_format = (isset ($quiz->body[LANGUAGE_NONE][0]['format'])) ? $quiz->body[LANGUAGE_NONE][0]['format'] : NULL ; if (!$admin) { if (!empty($score['result_option'])) { // Unscored quiz, return the proper result option. - $summary['result'] = check_markup($score['result_option'], $quiz->body[LANGUAGE_NONE][0]['format']); + $summary['result'] = check_markup($score['result_option'], $quiz_format); } else { $result_option = _quiz_pick_result_option($quiz->nid, $quiz->vid, $score['percentage_score']); @@ -3345,7 +3347,7 @@ function _quiz_get_summary_text($quiz, $score) { $summary = array(); elseif (variable_get('quiz_use_passfail', 1) == 0) { // If there is only a single summary text, use this. if (trim($quiz->summary_default) != '') { - $summary['passfail'] = check_markup($quiz->summary_default, $quiz->body[LANGUAGE_NONE][0]['format']); + $summary['passfail'] = check_markup($quiz->summary_default, $quiz_format); } } elseif (trim($quiz->summary_pass) != '') {