Merge remote-tracking branch 'origin/support/2.13.0' into support/2.14.0

Author: btry

RoboFilePlugin.php

@@ -130,7 +130,16 @@ public function localesPull($percent = 70) {
     * @return void
     */
    public function localesMo() {
-      $this->_exec('./tools/release --compile-mo');
+      $po_files = preg_grep('/\.po$/', scandir('./locales'));
+      foreach ($po_files as $po_file) {
+         $mo_file = preg_replace('/\.po$/', '.mo', $po_file);
+         echo("Processing {$po_file}\n");
+         passthru("cd ./locales && msgfmt -f -o {$mo_file} {$po_file}", $exit_code);
+         if ($exit_code > 0) {
+            exit($exit_code);
+         }
+      }
+
       return $this;
    }
 

inc/field/multiselectfield.class.php

@@ -34,6 +34,7 @@
 
 use Dropdown;
 use Html;
+use Glpi\Toolbox\Sanitizer;
 
 class MultiSelectField extends CheckboxesField
 {
@@ -55,8 +56,10 @@ public function getRenderedHtml($domain, $canEdit = true): string {
       $fieldName = 'formcreator_field_' . $id;
       $values    = $this->getAvailableValues();
       $translatedValues = [];
+
       foreach ($values as $key => $value) {
-         $translatedValues[$key] = __($value, $domain);
+         $unsanitized = Sanitizer::unsanitize(__($value, $domain));
+         $translatedValues[$key] = $unsanitized;
       }
       if (!empty($values)) {
          $html .= Dropdown::showFromArray($fieldName, $translatedValues, [

install/install.php

@@ -82,6 +82,7 @@ class PluginFormcreatorInstall {
       '2.13.3' => '2.13.4',
       '2.13.4' => '2.13.5',
       '2.13.5' => '2.13.6',
+      '2.13.6' => '2.13.7',
       '2.13.6' => '2.14',
    ];