diff -r 5e7a0fedabdf -r 877f952ae2bd web/lib/Zend/Amf/Parse/Serializer.php --- a/web/lib/Zend/Amf/Parse/Serializer.php Thu Mar 21 17:31:31 2013 +0100 +++ b/web/lib/Zend/Amf/Parse/Serializer.php Thu Mar 21 19:50:53 2013 +0100 @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Amf * @subpackage Parse - * @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: Serializer.php 21968 2010-04-22 03:53:34Z matthew $ + * @version $Id: Serializer.php 25179 2012-12-22 21:29:30Z rob $ */ /** @@ -25,7 +25,7 @@ * * @package Zend_Amf * @subpackage Parse - * @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 */ abstract class Zend_Amf_Parse_Serializer @@ -38,6 +38,13 @@ protected $_stream; /** + * str* functions overloaded using mbstring.func_overload + * + * @var bool + */ + protected $mbStringFunctionsOverloaded; + + /** * Constructor * * @param Zend_Amf_Parse_OutputStream $stream @@ -46,6 +53,7 @@ public function __construct(Zend_Amf_Parse_OutputStream $stream) { $this->_stream = $stream; + $this->_mbStringFunctionsOverloaded = function_exists('mb_strlen') && (ini_get('mbstring.func_overload') !== '') && ((int)ini_get('mbstring.func_overload') & 2); } /**