diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index 9c257f477d9..8d48b54c51d 100644
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -645,6 +645,10 @@ class assignment_base {
 
                     if ($updatedb){
                         if ($newsubmission) {
+                        /// assignment_submissions->data1  and assignment_submissions->data2 are not null (and
+                        /// text columns haven't a default, so we must provide it before insert. MDL-11268
+                            $submission->data1 = '';
+                            $submission->data2 = '';
                             if (!insert_record('assignment_submissions', $submission)) {
                                 return false;
                             }
@@ -652,7 +656,7 @@ class assignment_base {
                             if (!update_record('assignment_submissions', $submission)) {
                                 return false;
                             }
-                        }            
+                        }
                         //add to log only if updating
                         add_to_log($this->course->id, 'assignment', 'update grades', 
                                    'submissions.php?id='.$this->assignment->id.'&user='.$submission->userid,