From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Sun, 25 Apr 2010 18:22:26 +0000 (-0400)
Subject: make sure pingState is always an array
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=46cf13393ab1709afd22c9a760dc117d99c408b5;p=horde.git

make sure pingState is always an array
---

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/State/History.php b/framework/ActiveSync/lib/Horde/ActiveSync/State/History.php
index 6d293f70b..81a4968d9 100644
--- a/framework/ActiveSync/lib/Horde/ActiveSync/State/History.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync/State/History.php
@@ -420,7 +420,7 @@ class Horde_ActiveSync_State_History extends Horde_ActiveSync_State_Base
             $this->_deviceInfo->user = $result['device_user'];
             $this->_deviceInfo->supported = unserialize($result['device_supported']);
             if ($result['device_ping']) {
-                $this->_pingState = unserialize($result['device_ping']);
+                $this->_pingState = empty($result['device_ping']) ? array() : unserialize($result['device_ping']);
             } else {
                 $this->resetPingState();
             }