From: tjhunt <tjhunt>
Date: Tue, 27 Jan 2009 06:35:56 +0000 (+0000)
Subject: forum rating: MDL-18044 notice sometimes when a forum is rated, also XHTML strict... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=853a3eefd4c8969e0d32d89ea15e2a217757c185;p=moodle.git

forum rating: MDL-18044 notice sometimes when a forum is rated, also XHTML strict problems and fix incorrect help text.
---

diff --git a/course/scales.php b/course/scales.php
index ae3e6554aa..2e14068642 100644
--- a/course/scales.php
+++ b/course/scales.php
@@ -42,6 +42,7 @@
                 echo text_to_html($scale->description);
                 print_simple_box_end();
                 close_window_button();
+                print_footer('empty');
                 exit;
             }
         }
@@ -52,7 +53,7 @@
 
         if (has_capability('moodle/course:managescales', $context)) {
             echo "<p align=\"center\">(";
-            print_string("scalestip");
+            print_string('scalestip2');
             echo ")</p>";
         }
 
@@ -94,6 +95,6 @@
     }
 
     close_window_button();
-    exit;
+    print_footer('empty');
 
 ?>
diff --git a/lang/en_utf8/moodle.php b/lang/en_utf8/moodle.php
index bdfdafec17..f15fc9d1f6 100644
--- a/lang/en_utf8/moodle.php
+++ b/lang/en_utf8/moodle.php
@@ -1355,6 +1355,7 @@ $string['scalescustomno'] = 'No custom scales have been created yet';
 $string['scalesstandard'] = 'Standard scales';
 $string['scalestandard'] = 'Standard scale';
 $string['scalestip'] = 'To create custom scales, use the \'Scales...\' link in your course administration menu.';
+$string['scalestip2'] = 'To create custom scales, click the Grades link in the course administration menu, then choose Edit, Scales.';
 $string['schedule'] = 'Schedule';
 $string['scheduledbackupsinactive'] = 'Scheduled backups haven\'t been enabled by the site admin';
 $string['scheduledbackupstatus'] = 'Scheduled backup status';
diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 88c5ca9049..1bbb3687eb 100644
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -5264,7 +5264,9 @@ function forum_print_discussion($course, $cm, $forum, $discussion, $post, $mode,
     $ratingsmenuused = false;
     $ratingsformused = false;
     if ($forum->assessed and isloggedin()) {
-        if ($ratings->scale = make_grades_menu($forum->scale)) {
+        if ($scale = make_grades_menu($forum->scale)) {
+            $ratings =new object();
+            $ratings->scale = $scale;
             $ratings->assesstimestart = $forum->assesstimestart;
             $ratings->assesstimefinish = $forum->assesstimefinish;
             $ratings->allow = $canrate;
@@ -5293,7 +5295,6 @@ function forum_print_discussion($course, $cm, $forum, $discussion, $post, $mode,
         }
     }
 
-
     $post->forum = $forum->id;   // Add the forum id to the post object, later used by forum_print_post
     $post->forumtype = $forum->type;