commit 811f46048ee633f852c756a7f974e29770b37fdf Author: Fanmail Administrator Date: Tue Feb 19 12:38:45 2013 -0600 replace und with constant LANGUAGE_NONE for clarity diff --git a/question_types/long_answer/long_answer.admin.inc b/question_types/long_answer/long_answer.admin.inc index 77399f5..76d7c40 100644 --- a/question_types/long_answer/long_answer.admin.inc +++ b/question_types/long_answer/long_answer.admin.inc @@ -77,7 +77,7 @@ function long_answer_score_form($form, $form_state, $node, $answer) { $form['question'] = array( '#type' => 'item', '#title' => t('Question'), - '#markup' => check_markup($node->body['und'][0]['value'], $node->body['und'][0]['format']), + '#markup' => check_markup($node->body[LANGUAGE_NONE][0]['value'], $node->body[LANGUAGE_NONE][0]['format']), ); $form['rubric'] = array( '#type' => 'item', diff --git a/question_types/quiz_ddlines/quiz_ddlines.classes.inc b/question_types/quiz_ddlines/quiz_ddlines.classes.inc index 9ea7cf3..2501efc 100644 --- a/question_types/quiz_ddlines/quiz_ddlines.classes.inc +++ b/question_types/quiz_ddlines/quiz_ddlines.classes.inc @@ -137,7 +137,7 @@ class DDLinesQuestion extends QuizQuestion { '#default_value' => '', ); - $image_uri = $this->node->field_image['und'][0]['uri']; + $image_uri = $this->node->field_image[LANGUAGE_NONE][0]['uri']; $image_url = image_style_url('large',$image_uri); $form['image'] = array ( diff --git a/question_types/quiz_question/quiz_question.module b/question_types/quiz_question/quiz_question.module index bc579bc..9cecece 100644 --- a/question_types/quiz_question/quiz_question.module +++ b/question_types/quiz_question/quiz_question.module @@ -318,7 +318,7 @@ function quiz_question_list_questions($count = 0, $offset = 0) { */ $questions = array(); while ($question = $query->fetch()) { - $question->question = check_markup($question->body, $question->body['und'][0]['format']); + $question->question = check_markup($question->body, $question->body[LANGUAGE_NONE][0]['format']); $questions[] = $question; } return $questions; diff --git a/question_types/short_answer/short_answer.admin.inc b/question_types/short_answer/short_answer.admin.inc index c1b0f2a..17ce476 100644 --- a/question_types/short_answer/short_answer.admin.inc +++ b/question_types/short_answer/short_answer.admin.inc @@ -78,7 +78,7 @@ function short_answer_score_form($form, $context, $node, $answer) { $form['question'] = array( '#type' => 'item', '#title' => t('Question'), - '#markup' => check_markup($node->body['und'][0]['value'], $node->body['und'][0]['format']), + '#markup' => check_markup($node->body[LANGUAGE_NONE][0]['value'], $node->body[LANGUAGE_NONE][0]['format']), ); $form['answer'] = array( '#type' => 'item', diff --git a/quiz.admin.inc b/quiz.admin.inc index 5a42f60..8534081 100644 --- a/quiz.admin.inc +++ b/quiz.admin.inc @@ -1786,10 +1786,10 @@ function theme_quiz_admin_summary($variables) { $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"; if (isset($summary['passfail'])) { - $output .= '
' . check_markup($summary['passfail'], $quiz->body['und'][0]['format']) . '
' . "\n"; + $output .= '
' . check_markup($summary['passfail'], $quiz->body[LANGUAGE_NONE][0]['format']) . '
' . "\n"; } if (isset($summary['result'])) { - $output .= '
' . check_markup($summary['result'], $quiz->body['und'][0]['format']) . '
' . "\n"; + $output .= '
' . check_markup($summary['result'], $quiz->body[LANGUAGE_NONE][0]['format']) . '
' . "\n"; } // Get the feedback for all questions. diff --git a/quiz.module b/quiz.module index cec3773..0731494 100644 --- a/quiz.module +++ b/quiz.module @@ -3012,7 +3012,7 @@ 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['und'][0]['format']); + $new_question->question = check_markup($node->body, $node->body[LANGUAGE_NONE][0]['format']); } $new_question->title = $node->title; $new_question->nid = $node->nid; @@ -3328,7 +3328,7 @@ function _quiz_get_summary_text($quiz, $score) { $summary = array(); if (!$admin) { if (!empty($score['result_option'])) { // Unscored quiz, return the proper result option. - $summary['result'] = check_markup($score['result_option'], $quiz->body['und'][0]['format']); + $summary['result'] = check_markup($score['result_option'], $quiz->body[LANGUAGE_NONE][0]['format']); } else { $result_option = _quiz_pick_result_option($quiz->nid, $quiz->vid, $score['percentage_score']); @@ -3345,7 +3345,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['und'][0]['format']); + $summary['passfail'] = check_markup($quiz->summary_default, $quiz->body[LANGUAGE_NONE][0]['format']); } } elseif (trim($quiz->summary_pass) != '') {