MDL-61650 assign: More consistent empty text

Consistently check for empty submissions with count_words(trim($text)).
moodle · Aug 3, 2018 · 29d8157 · 29d8157
1 parent e8ebf0f
commit 29d8157
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/mod/assign/submission/onlinetext/locallib.php b/mod/assign/submission/onlinetext/locallib.php
@@ -575,8 +575,13 @@ public function delete_instance() {
      */
     public function is_empty(stdClass $submission) {
         $onlinetextsubmission = $this->get_onlinetext_submission($submission->id);
+        $wordcount = 0;
 
-        return empty($onlinetextsubmission->onlinetext);
+        if (isset($onlinetextsubmission->onlinetext)) {
+            $wordcount = count_words(trim($onlinetextsubmission->onlinetext));
+        }
+
+        return $wordcount == 0;
     }
 
     /**
@@ -592,7 +597,13 @@ public function submission_is_empty(stdClass $data) {
         if (!isset($data->onlinetext_editor)) {
             return true;
         }
-        return !strlen((string)$data->onlinetext_editor['text']);
+        $wordcount = 0;
+
+        if (isset($data->onlinetext_editor['text'])) {
+            $wordcount = count_words(trim((string)$data->onlinetext_editor['text']));
+        }
+
+        return $wordcount == 0;
     }
 
     /**