Merge remote-tracking branch 'origin/master' into 0.10.0

2018-06-01 08:01:09 +02:00
parent 8ccb898aa9 b80bdcbc4f
commit d39cebc70e
20 changed files with 100 additions and 49 deletions
--- a/lib/classes/api/commands/class.CustomerBackups.php
+++ b/lib/classes/api/commands/class.CustomerBackups.php
@@ -101,7 +101,7 @@ class CustomerBackups extends ApiCommand implements ResourceEntity
 		Database::pexecute($sel_stmt);
 		$result = array();
 		while ($entry = $sel_stmt->fetch(PDO::FETCH_ASSOC)) {
-			$entry['data'] = unserialize($entry['data']);
+			$entry['data'] = json_decode($entry['data'], true);
 			if (in_array($entry['data']['customerid'], $customer_ids)) {
 				$result[] = $entry;
 			}