--- a/web/lib/Zend/Amf/Parse/Amf3/Deserializer.php Thu Mar 21 17:31:31 2013 +0100
+++ b/web/lib/Zend/Amf/Parse/Amf3/Deserializer.php Thu Mar 21 19:50:53 2013 +0100
@@ -15,9 +15,9 @@
* @category Zend
* @package Zend_Amf
* @subpackage Parse_Amf3
- * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
- * @version $Id: Deserializer.php 21968 2010-04-22 03:53:34Z matthew $
+ * @version $Id: Deserializer.php 24593 2012-01-05 20:35:02Z matthew $
*/
/** Zend_Amf_Parse_Deserializer */
@@ -34,7 +34,7 @@
* @todo Class could be implemented as Factory Class with each data type it's own class.
* @package Zend_Amf
* @subpackage Parse_Amf3
- * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Amf_Parse_Amf3_Deserializer extends Zend_Amf_Parse_Deserializer
@@ -225,7 +225,7 @@
$timestamp = floor($this->_stream->readDouble() / 1000);
require_once 'Zend/Date.php';
- $dateTime = new Zend_Date((int) $timestamp);
+ $dateTime = new Zend_Date($timestamp);
$this->_referenceObjects[] = $dateTime;
return $dateTime;
}
@@ -385,6 +385,7 @@
}
// Add properties back to the return object.
+ if (!is_array($properties)) $properties = array();
foreach($properties as $key=>$value) {
if($key) {
$returnObject->$key = $value;