From a04e97ef0cfef85d630789c9bcf2c2d785565684 Mon Sep 17 00:00:00 2001
From: Damyon Wiese <damyon@moodle.com>
Date: Thu, 9 May 2013 11:22:49 +0800
Subject: [PATCH] MDL-39412 Prevent developer warnings on upgrade from 24 to
 master

---
 lib/adminlib.php                               | 2 +-
 question/behaviour/manualgraded/db/upgrade.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/adminlib.php b/lib/adminlib.php
index dbacd3f3b74..af6bab71f73 100644
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -4142,7 +4142,7 @@ class admin_setting_question_behaviour extends admin_setting_configselect {
     public function load_choices() {
         global $CFG;
         require_once($CFG->dirroot . '/question/engine/lib.php');
-        $this->choices = question_engine::get_behaviour_options();
+        $this->choices = question_engine::get_behaviour_options('');
         return true;
     }
 }
diff --git a/question/behaviour/manualgraded/db/upgrade.php b/question/behaviour/manualgraded/db/upgrade.php
index 1f19058f2c3..e33b001249f 100644
--- a/question/behaviour/manualgraded/db/upgrade.php
+++ b/question/behaviour/manualgraded/db/upgrade.php
@@ -64,7 +64,7 @@ function xmldb_qbehaviour_manualgraded_upgrade($oldversion) {
 
         // Work out a sensible default alternative to manualgraded.
         require_once($CFG->libdir . '/questionlib.php');
-        $behaviours = question_engine::get_behaviour_options();
+        $behaviours = question_engine::get_behaviour_options('');
         if (array_key_exists('deferredfeedback', $behaviours)) {
              $defaultbehaviour = 'deferredfeedback';
         } else {