From 92b0d47c20ca903bd344735ccdcb347221f0b328 Mon Sep 17 00:00:00 2001
From: skodak <skodak>
Date: Sat, 2 Feb 2008 21:34:08 +0000
Subject: [PATCH] MDL-12900 prevent fatal errors when incorrect scale id
 specified in grade_item; mergedfrom MOODLE_19_STABLE

---
 lib/grade/grade_item.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/grade/grade_item.php b/lib/grade/grade_item.php
index 0db6c37080..9f94529c3f 100644
--- a/lib/grade/grade_item.php
+++ b/lib/grade/grade_item.php
@@ -785,6 +785,11 @@ class grade_item extends grade_object {
             //do not load scale if already present
             if (empty($this->scale->id) or $this->scale->id != $this->scaleid) {
                 $this->scale = grade_scale::fetch(array('id'=>$this->scaleid));
+                if (!$this->scale) {
+                    debugging('Incorrect scale id: '.$this->scaleid);
+                    $this->scale = null;
+                    return null;
+                }
                 $this->scale->load_items();
             }
 
-- 
2.39.5