From: danmarsden <danmarsden>
Date: Tue, 31 Oct 2006 19:00:55 +0000 (+0000)
Subject: merged choice fix from Stable MDL-7171
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=a337045d86b440b2de8d6c925b14c3440e5a0637;p=moodle.git

merged choice fix from Stable MDL-7171
---

diff --git a/mod/choice/view.php b/mod/choice/view.php
index 54605de82f..265d64aa3e 100644
--- a/mod/choice/view.php
+++ b/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);