Merge branch 'cherry-pick-87ca56dd' into '1.2.1-fixes'

Merge branch '5730-php-error-htmlentities-expects-parameter-… into '1.2.1-fixes'

See merge request fusiondirectory/fd!341

include/simpleplugin/class_Attribute.inc

@@ -566,7 +566,18 @@ class Attribute
   {
     if ($this->visible) {
       if ($readOnly) {
-        $input = '{literal}'.htmlentities($this->getValue(), ENT_COMPAT, 'UTF-8').'{/literal}';
+        $value = $this->getValue();
+        if (is_array($value)) {
+          $input = '{literal}'.implode('<br/>', array_map(
+            function ($v)
+            {
+              return htmlentities($v, ENT_COMPAT, 'UTF-8');
+            },
+            $value
+          )).'{/literal}';
+        } else {
+          $input = '{literal}'.htmlentities($value, ENT_COMPAT, 'UTF-8').'{/literal}';
+        }
       } elseif (is_object($this->plugin) && $this->plugin->is_template) {
         $input = $this->renderTemplateInput();
       } else {