MDL-11482 Resolved the sum icon issue (added a new x-bar icon) and resolved a depende...

diff --git a/course/lib.php b/course/lib.php
index 123c7e85dad67fdc7d08f1df008b44b799f50afc..41d1d4ce9603c50433d0143ae4afd28f546822ad 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -2078,13 +2078,14 @@ function get_course_section($section, $courseid) {
     $id = insert_record("course_sections", $cw);
     return get_record("course_sections", "id", $id);
 }
-
+/**
+ * Given a full mod object with section and course already defined, adds this module to that section.
+ *
+ * @param object $mod
+ * @param int $beforemod An existing ID which we will insert the new module before
+ * @return int The course_sections ID where the mod is inserted
+ */
 function add_mod_to_section($mod, $beforemod=NULL) {
-/// Given a full mod object with section and course already defined
-/// If $before is specified, then this is an existing ID which we
-/// will insert the new module before
-///
-/// Returns the course_sections ID where the mod is inserted
 
     if ($section = get_record("course_sections", "course", "$mod->course", "section", "$mod->section")) {
 

diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
index 98fd2dae7ddb7199fab5608fdbc959f564eaf797..a68bc33cf6c2d8ec253b799759c101e20bc30849 100644 (file)
--- a/grade/report/grader/lib.php
+++ b/grade/report/grader/lib.php
@@ -374,7 +374,7 @@ class grade_report_grader extends grade_report {
         $icons = array('eyecons' => 't/hide.gif',
                        'calculations' => 't/calc.gif',
                        'locks' => 't/lock.gif',
-                       'averages' => 't/sigma.gif',
+                       'averages' => 't/mean.gif',
                        'nooutcomes' => 't/outcomes.gif');
 
         $pref_name = 'grade_report_show' . $type;

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 8edfe63e6948e1afc927db9d4c06a8dc4bcf8e12..6d7756d18fd2e721a62cb63d4dd0a8b9d423fe81 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -2852,6 +2852,7 @@ function truncate_userinfo($info) {
 function delete_user($user) {
     global $CFG;
     require_once($CFG->libdir.'/grouplib.php');
+    require_once($CFG->libdir.'/gradelib.php');
 
     begin_sql();
 

diff --git a/pix/i/mean.gif b/pix/i/mean.gif
new file mode 100644 (file)
index 0000000..ba300dd
Binary files /dev/null and b/pix/i/mean.gif differ

diff --git a/pix/t/mean.gif b/pix/t/mean.gif
new file mode 100644 (file)
index 0000000..4c113e4
Binary files /dev/null and b/pix/t/mean.gif differ