baculum: Fix #2560 in restore wizard display names encoded in non-UTF encoding

diff --git a/gui/baculum/protected/API/Class/BaculumAPIServer.php b/gui/baculum/protected/API/Class/BaculumAPIServer.php
index 568c2a1dd72325f63cb034daca82c2c673032da5..0caf5483073b73b885865b0db7e305b9a805349f 100644 (file)
--- a/gui/baculum/protected/API/Class/BaculumAPIServer.php
+++ b/gui/baculum/protected/API/Class/BaculumAPIServer.php
@@ -236,7 +236,13 @@ abstract class BaculumAPIServer extends TPage {
        private function getOutput() {
                $output = array('output' => $this->output, 'error' => $this->error);
                $this->setOutputHeaders();
-               $json = json_encode($output);
+               $json = '';
+               if (PHP_VERSION_ID >= 70200) {
+                       // Allow displaying characters encoded in non-UTF encoding (supported from PHP 7.2.0)
+                       $json = json_encode($output, JSON_INVALID_UTF8_SUBSTITUTE);
+               } else {
+                       $json = json_encode($output);
+               }
                return $json;
        }