From: Marcin Haba <marcin.haba@bacula.pl>
Date: Sun, 12 Aug 2018 10:33:57 +0000 (+0200)
Subject: baculum: Fix logging output if it is not possible to decode to json
X-Git-Tag: Release-9.4.0~92
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc450e0cc7848f2c4bbb6e2c49f3be2cfa42fb19;p=thirdparty%2Fbacula.git

baculum: Fix logging output if it is not possible to decode to json
---

diff --git a/gui/baculum/protected/API/Class/JSONTools.php b/gui/baculum/protected/API/Class/JSONTools.php
index d63e0f24bd..9b456c6bd3 100644
--- a/gui/baculum/protected/API/Class/JSONTools.php
+++ b/gui/baculum/protected/API/Class/JSONTools.php
@@ -45,7 +45,7 @@ class JSONTools extends APIModule
 		$output_txt = implode('', $output);
 		$out = json_decode($output_txt, true);
 		if (!is_array($out)) {
-			$this->getModule('logging')->log('Parse output', $out, Logging::CATEGORY_EXTERNAL, __FILE__, __LINE__);
+			$this->getModule('logging')->log('Parse output', $output_txt, Logging::CATEGORY_EXTERNAL, __FILE__, __LINE__);
 			$out = null;
 		}
 		return $out;