From bd43f5d9fa95b199950e1bbde0dd65612ca701f3 Mon Sep 17 00:00:00 2001 From: Dan Garner Date: Thu, 4 Apr 2019 13:31:22 +0100 Subject: [PATCH] Fix for NULL xmrPubKey OSX-499 xibosignage/xibo#1776 --- lib/Entity/Display.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Entity/Display.php b/lib/Entity/Display.php index fed79b6610..4e8080fa79 100644 --- a/lib/Entity/Display.php +++ b/lib/Entity/Display.php @@ -695,7 +695,7 @@ private function add() 'email_alert' => 0, 'alert_timeout' => 0, 'xmrChannel' => $this->xmrChannel, - 'xmrPubKey' => $this->xmrPubKey, + 'xmrPubKey' => ($this->xmrPubKey === null) ? '' : $this->xmrPubKey, 'lastCommandSuccess' => $this->lastCommandSuccess, 'macAddress' => $this->macAddress ]); @@ -783,7 +783,7 @@ private function edit() 'storageAvailableSpace' => $this->storageAvailableSpace, 'storageTotalSpace' => $this->storageTotalSpace, 'xmrChannel' => $this->xmrChannel, - 'xmrPubKey' => $this->xmrPubKey, + 'xmrPubKey' => ($this->xmrPubKey === null) ? '' : $this->xmrPubKey, 'lastCommandSuccess' => $this->lastCommandSuccess, 'deviceName' => $this->deviceName, 'timeZone' => $this->timeZone,