Permalink
Browse files

merged choice fix from Stable MDL-7171

  • Loading branch information...
1 parent 42a2f77 commit a337045d86b440b2de8d6c925b14c3440e5a0637 danmarsden committed Oct 31, 2006
Showing with 13 additions and 12 deletions.
  1. +13 −12 mod/choice/view.php
View
25 mod/choice/view.php
@@ -102,18 +102,6 @@
- // print the results at the bottom of the screen
-
- if ( $choice->showresults == CHOICE_SHOWRESULTS_ALWAYS or
- ($choice->showresults == CHOICE_SHOWRESULTS_AFTER_ANSWER and $current ) or
- ($choice->showresults == CHOICE_SHOWRESULTS_AFTER_CLOSE and $choice->timeclose <= time() ) ) {
-
- choice_show_results($choice, $course, $cm);
-
- } else if (!$choiceformshown) {
- print_simple_box(get_string('noresultsviewable', 'choice'), 'center');
- }
-
if (!$choiceformshown) {
$sitecontext = get_context_instance(CONTEXT_SYSTEM);
@@ -141,6 +129,19 @@
}
}
+ // print the results at the bottom of the screen
+
+ if ( $choice->showresults == CHOICE_SHOWRESULTS_ALWAYS or
+ ($choice->showresults == CHOICE_SHOWRESULTS_AFTER_ANSWER and $current ) or
+ ($choice->showresults == CHOICE_SHOWRESULTS_AFTER_CLOSE and $choice->timeclose <= time() ) ) {
+
+ choice_show_results($choice, $course, $cm);
+
+ } else if (!$choiceformshown) {
+ print_simple_box(get_string('noresultsviewable', 'choice'), 'center');
+ }
+
+
print_footer($course);

0 comments on commit a337045

Please sign in to comment.