Merge branch 'MDL-32192_rename_string' of git://github.com/andyjdavis…

…/moodle
sehaj-sk · Apr 25, 2012 · e69ac15 · e69ac15
2 parents 9c51f67 + af4f617
commit e69ac15
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/grade/report/grader/ajax_callbacks.php b/grade/report/grader/ajax_callbacks.php
@@ -52,7 +52,7 @@
         if (!empty($userid) && !empty($itemid) && $newvalue !== false && !empty($type)) {
             // Save the grade or feedback
             if (!$grade_item = grade_item::fetch(array('id'=>$itemid, 'courseid'=>$courseid))) { // we must verify course id here!
-                print_error('invalidgradeitmeid');
+                print_error('invalidgradeitemid');
             }
 
             /**

diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
@@ -199,7 +199,7 @@ public function process_data($data) {
             }
 
             if (!$gradeitem = grade_item::fetch(array('id'=>$itemid, 'courseid'=>$this->courseid))) { // we must verify course id here!
-                print_error('invalidgradeitmeid');
+                print_error('invalidgradeitemid');
             }
 
             // Pre-process grade

diff --git a/lang/en/error.php b/lang/en/error.php
@@ -289,7 +289,7 @@
 $string['invalidformatpara'] = 'Incorrect format for choose parameter';
 $string['invalidformdata'] = 'Incorrect form data';
 $string['invalidfunction'] = 'Incorrect function';
-$string['invalidgradeitmeid'] = 'Incorrect grade item id';
+$string['invalidgradeitemid'] = 'Incorrect grade item id';
 $string['invalidgroupid'] = 'Incorrect group id specified';
 $string['invalidipformat'] = 'Invalid IP address format';
 $string['invaliditemid'] = 'Incorrect item id';