MDL-10636 reverting last commit

diff --git a/lib/grade/grade_category.php b/lib/grade/grade_category.php
index 9e35ed2424f3014c2665766c0c20bb3ed97b92d1..6f4a51285155f59e11181a21e21864a11feee5a2 100644 (file)
--- a/lib/grade/grade_category.php
+++ b/lib/grade/grade_category.php
@@ -628,22 +628,12 @@ class grade_category extends grade_object {
      */
     function fetch_course_tree($courseid, $include_category_items=false) {
         $course_category = grade_category::fetch_course_category($courseid);
-        if (is_array($course_category)) {
-            debugging("grade_category::fetch_course_category($courseid) returned an array instead of an object. Returning only the first item.");
-            $course_category = reset($course_category);
-        }
-
-        if (is_object($course_category)) {
-            $category_array = array('object'=>$course_category, 'type'=>'category', 'depth'=>1,
-                                    'children'=>$course_category->get_children($include_category_items));
-            $sortorder = 1;
-            $course_category->set_sortorder($sortorder);
-            $course_category->sortorder = $sortorder;
-            return grade_category::_fetch_course_tree_recursion($category_array, $sortorder);
-        } else {
-            debugging("grade_category::fetch_course_category($courseid) returned '$course_category'");
-            return false;
-        }
+        $category_array = array('object'=>$course_category, 'type'=>'category', 'depth'=>1,
+                                'children'=>$course_category->get_children($include_category_items));
+        $sortorder = 1;
+        $course_category->set_sortorder($sortorder);
+        $course_category->sortorder = $sortorder;
+        return grade_category::_fetch_course_tree_recursion($category_array, $sortorder);
     }
 
     function _fetch_course_tree_recursion($category_array, &$sortorder) {
@@ -690,10 +680,6 @@ class grade_category extends grade_object {
         $cats  = get_records('grade_categories', 'courseid', $this->courseid);
         $items = get_records('grade_items', 'courseid', $this->courseid);
 
-        if (count($cats) == 0) {
-            debugging("get_records('grade_categories', 'courseid', $this->courseid) returned nothing.");
-        }
-
         // init children array first
         foreach ($cats as $catid=>$cat) {
             $cats[$catid]->children = array();
@@ -708,9 +694,6 @@ class grade_category extends grade_object {
                     continue;
                 }
                 $categoryid = $item->iteminstance;
-                if (is_null($categoryid)) {
-                    debugging("Itemtype was '$item->itemtype' (item->id=$item->id), but its iteminstance was null...");
-                }
             } else {
                 $categoryid = $item->categoryid;
             }
@@ -722,10 +705,6 @@ class grade_category extends grade_object {
                 $sortorder++;
             }
 
-            if (is_null($categoryid)) {
-                debugging('$categoryid was null!');
-            }
-
             $cats[$categoryid]->children[$sortorder] = $item;
 
         }

diff --git a/lib/grade/grade_item.php b/lib/grade/grade_item.php
index 759881e06871a5cb20caf163e5d1a93596d0dffa..4a4c19b28a3bcbe0be06747e6263e9af21b92a03 100644 (file)
--- a/lib/grade/grade_item.php
+++ b/lib/grade/grade_item.php
@@ -842,9 +842,6 @@ class grade_item extends grade_object {
      */
     function fetch_course_item($courseid) {
         if ($course_item = grade_item::fetch(array('courseid'=>$courseid, 'itemtype'=>'course'))) {
-            if (!is_object($course_item)) {
-                debugging("grade_item::fetch(array('courseid'=>$courseid, 'itemtype'=>'course')) returned '$course_item'!!");
-            }
             return $course_item;
         }
 

diff --git a/lib/grade/grade_object.php b/lib/grade/grade_object.php
index a322b1e8c2a634b65d012d582c2a53b59e2fabfc..0881d2905e5760048bce6c0bb4f1582a609a19f7 100644 (file)
--- a/lib/grade/grade_object.php
+++ b/lib/grade/grade_object.php
@@ -106,11 +106,10 @@ class grade_object {
         // in PHP5 we could do it much better
         if ($instances = grade_object::fetch_all_helper($table, $classname, $params)) {
             if (count($instances) > 1) {
-                // we should not tolerate any errors here - proplems might appear later
-                debugging('More than one course grade_item was found for this course. Using the first one.');
-                $instances = reset($instances);
+                // we should not tolerate any errors here - problems might appear later
+                error('Found more than one record in fetch() !');
             }
-            return $instances;
+            return reset($instances);
         } else {
             return false;
         }

diff --git a/lib/gradelib.php b/lib/gradelib.php
index 89abcc7249bff533cc2df6fb5f25f58ffa0aacf6..b5d9ae1dc08b2b66d7e888e8f35a1ab1e4a1eb9b 100644 (file)
--- a/lib/gradelib.php
+++ b/lib/gradelib.php
@@ -313,11 +313,8 @@ function grade_force_full_regrading($courseid) {
  * @return boolean true if ok, array of errors if problems found (item id is used as key)
  */
 function grade_regrade_final_grades($courseid, $userid=null, $updated_item=null) {
-    $course_item = grade_item::fetch_course_item($courseid);
 
-    if (!is_object($course_item)) {
-        debugging("Could not instantiate the course item! grade_item::fetch_course_item($courseid) returned '$course_item'");
-    }
+    $course_item = grade_item::fetch_course_item($courseid);
 
     if ($userid) {
         // one raw grade updated for one user