coderkun/questlab
1
0
Fork 0
Code Issues 15 Pull requests Projects Releases Wiki Activity

update Piwik to version 2.16 (fixes #91)

Browse source
This commit is contained in:
oliver 2016-04-10 18:55:57 +02:00
commit d885a4baa9
5833 changed files with 418860 additions and 226988 deletions
Download patch file Download diff file Expand all files Collapse all files

18
www/analytics/libs/Zend/Validate/StringLength.php
View file

@ -199,14 +199,24 @@ class Zend_Validate_StringLength extends Zend_Validate_Abstract
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';
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;