From 9bc8d3882e4678470f7f4d78ffeacca0e7bd2f66 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Wed, 22 Jul 2015 13:39:17 +0200
Subject: [PATCH] DbObject: Fix the array to string conversion

---
 library/Director/Data/Db/DbObject.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/library/Director/Data/Db/DbObject.php b/library/Director/Data/Db/DbObject.php
index 3d88a120..2ccdada5 100644
--- a/library/Director/Data/Db/DbObject.php
+++ b/library/Director/Data/Db/DbObject.php
@@ -600,6 +600,11 @@ abstract class DbObject
         $this->beforeStore();
         $table = $this->table;
         $id = $this->getId();
+        if (is_array($id)) {
+            $logId = json_encode($id);
+        } else {
+            $logId = $id;
+        }
         $result = false;
 
         try {
@@ -612,12 +617,12 @@ abstract class DbObject
                     $this->onUpdate();
                 } else {
                     throw new Exception(
-                        sprintf('FAILED storing %s "%s"', $table, $id));
+                        sprintf('FAILED storing %s "%s"', $table, $logId));
                 }
             } else {
                 if ($id && $this->existsInDb()) {
                     throw new Exception(
-                        sprintf('Trying to recreate %s (%s)', $table, $id)
+                        sprintf('Trying to recreate %s (%s)', $table, $logId)
                     );
                 }
 
@@ -634,20 +639,17 @@ abstract class DbObject
                     $result = true;
                 } else {
                     throw new Exception(
-                        sprintf('FAILED to store new %s "%s"', $table, $id)
+                        sprintf('FAILED to store new %s "%s"', $table, $logId)
                     );
                 }
             }
 
         } catch (Exception $e) {
-            if (is_array($id)) {
-                $id = print_r($id, 1);
-            }
             throw new Exception(
                 sprintf(
                     'Storing %s[%s] failed: %s {%s}',
                     $this->table,
-                    $id,
+                    $logId,
                     $e->getMessage(),
                     print_r($this->getProperties(), 1)
                 )