Improve length measuring for choices select header

better handles entities
kreut · Mar 27, 2020 · b133159 · b133159
1 parent 095e5b3
commit b133159
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/assess2/questions/answerboxes/ChoicesAnswerBox.php b/assess2/questions/answerboxes/ChoicesAnswerBox.php
@@ -98,7 +98,7 @@ public function generate(): void
     		if ($displayformat == "select") {
     			$msg = '?';
     			foreach ($questions as $qv) {
-    				if (strlen($qv)>2 && !($qv{0}=='&' && $qv{strlen($qv)-1}==';')) {
+    				if (mb_strlen(html_entity_decode($qv))>3) { //strlen($qv)>2 && !($qv{0}=='&' && $qv{strlen($qv)-1}==';')) {
     					$msg = _('Select an answer');
     					break;
     				}

diff --git a/assessment/displayq2.php b/assessment/displayq2.php
@@ -1320,7 +1320,7 @@ function makeanswerbox($anstype, $qn, $la, $options,$multi,$colorbox='') {
 		if ($displayformat == "select") {
 			$msg = '?';
 			foreach ($questions as $qv) {
-				if (strlen($qv)>2 && !($qv{0}=='&' && $qv{strlen($qv)-1}==';')) {
+				if (mb_strlen(html_entity_decode($qv))>3) { // (strlen($qv)>2 && !($qv{0}=='&' && $qv{strlen($qv)-1}==';')) {
 					$msg = _('Select an answer');
 					break;
 				}