github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-22 14:23:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r420

Browse source 
Исправление PHP Warning: json_encode() [<a href='function.json-encode'>function.json-encode</a>]: Invalid UTF-8 sequence in argument. Огромная просьба бета-тестарам проверить отсуствие каких-либо ошибок после данного обновления. Возможно потребуется откат к r419. git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@420 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
This commit is contained in:
glix08 2012-05-23 19:38:11 +00:00
commit 212ca0c0e9
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
upload/config.php
View file

@ -56,8 +56,8 @@ $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $do
// Increase number of revision after update // Increase number of revision after update
$bb_cfg['tp_version'] = '2.5 Beta'; $bb_cfg['tp_version'] = '2.5 Beta';
$bb_cfg['tp_release_state'] = 'R419'; $bb_cfg['tp_release_state'] = 'R420';
$bb_cfg['tp_release_date'] = '21-05-2012'; $bb_cfg['tp_release_date'] = '23-05-2012';
// Database // Database
$charset = 'utf8'; $charset = 'utf8';

1
upload/includes/functions.php
View file

@ -2517,6 +2517,7 @@ function caching_output ($enabled, $mode, $cache_var_name, $ttl = 300)
*/ */
function bb_json_encode ($data) function bb_json_encode ($data)
{ {
$data = mb_check_encoding($data, 'UTF-8') ? $data : utf8_encode($data);
return json_encode($data); return json_encode($data);
} }