diff -r 5a6b6e770365 -r 68c69c656a2c web/lib/Zend/Validate/StringLength.php --- a/web/lib/Zend/Validate/StringLength.php Thu May 07 15:10:09 2015 +0200 +++ b/web/lib/Zend/Validate/StringLength.php Thu May 07 15:16:02 2015 +0200 @@ -14,9 +14,9 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: StringLength.php 24593 2012-01-05 20:35:02Z matthew $ + * @version $Id$ */ /** @@ -27,7 +27,7 @@ /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_StringLength extends Zend_Validate_Abstract @@ -79,8 +79,7 @@ /** * Sets validator options * - * @param integer|array|Zend_Config $options - * @return void + * @param integer|array|Zend_Config $options */ public function __construct($options = array()) { @@ -194,19 +193,30 @@ * Sets a new encoding to use * * @param string $encoding + * @throws Zend_Validate_Exception * @return Zend_Validate_StringLength */ public function setEncoding($encoding = null) { if ($encoding !== null) { - $orig = iconv_get_encoding('internal_encoding'); - $result = iconv_set_encoding('internal_encoding', $encoding); + $orig = PHP_VERSION_ID < 50600 + ? iconv_get_encoding('internal_encoding') + : ini_get('default_charset'); + if (PHP_VERSION_ID < 50600) { + $result = iconv_set_encoding('internal_encoding', $encoding); + } else { + $result = ini_set('default_charset', $encoding); + } if (!$result) { require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('Given encoding not supported on this OS!'); } - iconv_set_encoding('internal_encoding', $orig); + if (PHP_VERSION_ID < 50600) { + iconv_set_encoding('internal_encoding', $orig); + } else { + ini_set('default_charset', $orig); + } } $this->_encoding = $encoding;