X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=blobdiff_plain;f=question%2Ftype%2Fmultichoice%2Fquestion.php;h=8dd7086116034808cfbb8c3c74a79019c61828e8;hp=afca6a477404c9def0ddab983f9cf5569386d694;hb=4c1a35e34c9cdc8dfd5a2d346ee5c183ab93d11e;hpb=6548ce091566295f49aeecec8519e78620e6cadc;ds=inline

diff --git a/question/type/multichoice/question.php b/question/type/multichoice/question.php
index afca6a47740..8dd70861160 100644
--- a/question/type/multichoice/question.php
+++ b/question/type/multichoice/question.php
@@ -126,10 +126,10 @@ abstract class qtype_multichoice_base extends question_graded_automatically {
     }
 
     public function make_html_inline($html) {
-        $html = preg_replace('~\s*<p>\s*~', '', $html);
-        $html = preg_replace('~\s*</p>\s*~', '<br />', $html);
-        $html = preg_replace('~<br />$~', '', $html);
-        return $html;
+        $html = preg_replace('~\s*<p>\s*~u', '', $html);
+        $html = preg_replace('~\s*</p>\s*~u', '<br />', $html);
+        $html = preg_replace('~(<br\s*/?>)+$~u', '', $html);
+        return trim($html);
     }
 }