Merge branch 'MDL-55161-m' of https://github.com/micaherne/moodle

andelacruz · Jul 18, 2016 · d66e54b · d66e54b
2 parents 90f3675 + b4beaed
commit d66e54b
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php
@@ -7978,6 +7978,10 @@ public function is_gradebook_feedback_enabled() {
         // Check if default gradebook feedback is visible and enabled.
         $gradebookfeedbackplugin = $this->get_feedback_plugin_by_type($gradebookplugin);
 
+        if (empty($gradebookfeedbackplugin)) {
+            return false;
+        }
+
         if ($gradebookfeedbackplugin->is_visible() && $gradebookfeedbackplugin->is_enabled()) {
             return true;
         }