MDL-9506 Resolved a small bug in grade_category that failed the set_as_parent method.

diff --git a/lib/grade/grade_category.php b/lib/grade/grade_category.php
index d39ed115b932fcfd097c2b882514ca6d0cc26796..a0195837c6d1855f652cbbd99a3ad613b4fbd770 100644 (file)
--- a/lib/grade/grade_category.php
+++ b/lib/grade/grade_category.php
@@ -743,10 +743,11 @@ class grade_category extends grade_object {
             debugging("Could not update this category's sortorder in DB.");
             return false;
         }
-
-        $query = "UPDATE {$CFG->prefix}grade_items SET sortorder = sortorder + 1 WHERE sortorder >= $this->grade_item->sortorder";
+        
+        $query = "UPDATE {$CFG->prefix}grade_items SET sortorder = sortorder + 1 WHERE sortorder >= {$this->grade_item->sortorder}";
         if (!execute_sql($query)) {
             debugging("Could not update the sortorder of grade_items listed after this category.");
+            return false;
         } else {
             return true;
         }

diff --git a/lib/simpletest/grade/simpletest/testgradecategory.php b/lib/simpletest/grade/simpletest/testgradecategory.php
index 22cf81d3694e252e0511474cd01a97d7eedede52..73b4a9ffb474f34463c8fa51ded7f654fd9da2ef 100755 (executable)
--- a/lib/simpletest/grade/simpletest/testgradecategory.php
+++ b/lib/simpletest/grade/simpletest/testgradecategory.php
@@ -223,6 +223,7 @@ class grade_category_test extends gradelib_test {
         $grade_category = new grade_category();
         $grade_category->fullname    = 'new topcategory';
         $grade_category->courseid    = $this->courseid;
+        $grade_category->insert();
 
         // 1. mixed types of children
         $child1 = new grade_item();
@@ -254,6 +255,8 @@ class grade_category_test extends gradelib_test {
         $child2->itemname = 'new grade_item';
         $child1->sortorder = 1;
         $child2->sortorder = 2;
+        $child1->insert();
+        $child2->insert();
         $this->assertTrue($grade_category->set_as_parent(array($child1, $child2)));
     }
 }