From 29d815799b20c01ed4defd038626fc769214aa77 Mon Sep 17 00:00:00 2001 From: Damyon Wiese Date: Fri, 3 Aug 2018 16:52:31 +0800 Subject: [PATCH] MDL-61650 assign: More consistent empty text Consistently check for empty submissions with count_words(trim($text)). --- mod/assign/submission/onlinetext/locallib.php | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/mod/assign/submission/onlinetext/locallib.php b/mod/assign/submission/onlinetext/locallib.php index 85ea4dc3314..0388172f644 100644 --- a/mod/assign/submission/onlinetext/locallib.php +++ b/mod/assign/submission/onlinetext/locallib.php @@ -575,8 +575,13 @@ class assign_submission_onlinetext extends assign_submission_plugin { */ 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 @@ class assign_submission_onlinetext extends assign_submission_plugin { 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; } /**