MDL-20636 Merge branch 'master' into qe2_wip

[moodle.git] / question / format / gift / format.php

diff --git a/question/format/gift/format.php b/question/format/gift/format.php
old mode 100755 (executable)
new mode 100644 (file)
index e086691..6d3e4c4
--- a/question/format/gift/format.php
+++ b/question/format/gift/format.php
@@ -288,7 +288,7 @@ class qformat_gift extends qformat_default {
 
         switch ($question->qtype) {
             case DESCRIPTION:
-                $question->defaultgrade = 0;
+                $question->defaultmark = 0;
                 $question->length = 0;
                 return $question;
                 break;
@@ -350,7 +350,7 @@ class qformat_gift extends qformat_default {
                     $question->fraction[$key] = $answer_weight;
                 }  // end foreach answer
 
-                //$question->defaultgrade = 1;
+                //$question->defaultmark = 1;
                 //$question->image = "";   // No images with this format
                 return $question;
                 break;
@@ -731,4 +731,3 @@ class qformat_gift extends qformat_default {
         return $expout;
     }
 }
-