From: Marcin Haba <marcin.haba@bacula.pl>
Date: Sun, 8 Feb 2015 19:55:43 +0000 (+0100)
Subject: baculum: Fix show job log with national characters
X-Git-Tag: Release-7.2.0~78
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8a52b0c387a3bfa9b6cc24da289142308af649eb;p=bacula%2Fbacula

baculum: Fix show job log with national characters
---

diff --git a/gui/baculum/protected/Pages/API/JobLog.php b/gui/baculum/protected/Pages/API/JobLog.php
index b36efebd4f..ba4ccbad75 100644
--- a/gui/baculum/protected/Pages/API/JobLog.php
+++ b/gui/baculum/protected/Pages/API/JobLog.php
@@ -23,7 +23,8 @@ class JobLog extends BaculumAPI {
 		$job = $this->getModule('job')->getJobById($jobid);
 		if(!is_null($job)) {
 			$log = $this->getModule('joblog')->getLogByJobId($job->jobid);
-			$this->output = $log;
+			// Output may contain national characters.
+			$this->output = array_map('utf8_encode', $log);
 			$this->error = JobError::ERROR_NO_ERRORS;
 		} else {
 			$this->output = JobError::MSG_ERROR_JOB_DOES_NOT_EXISTS;
@@ -32,4 +33,4 @@ class JobLog extends BaculumAPI {
 	}
 }
 
-?>
\ No newline at end of file
+?>