shortanswer qtype: MDL-17800 Fix merge problem. Thanks to Oleg for spotting this.

diff --git a/question/type/shortanswer/questiontype.php b/question/type/shortanswer/questiontype.php
index 269e903ae6e2492e10c1d47723c5d4b9ff5926e6..6e125c194e98aedba1dc410699136cf8afd26fdc 100644 (file)
--- a/question/type/shortanswer/questiontype.php
+++ b/question/type/shortanswer/questiontype.php
@@ -262,6 +262,8 @@ class question_shortanswer_qtype extends default_questiontype {
                 $status = $status && $DB->update_record($questionextensiontable, $questionextradata);
             }
         }
+
+        return $status;
     }
 
    /**