mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[ticket/10824] Use json_sanitzer::decode and improve migrations from pre 3.2

Browse Source 
PHPBB3-10824
This commit is contained in:
Marc Alexander
2018-12-28 11:15:40 +01:00
parent 5dc2e500f5
commit 204f81c6f7
6 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/phpbb/language/language_file_helper.php
View File

@@ -13,6 +13,7 @@
namespace phpbb\language;
use phpbb\json_sanitizer;
use Symfony\Component\Finder\Finder;
/**
@@ -54,7 +55,7 @@ class language_file_helper
foreach ($finder as $file)
{
$json = $file->getContents();
$data = \phpbb\json_sanitizer::sanitize(json_decode($json, true));
$data = json_sanitizer::decode($json);
$available_languages[] = $this->get_language_data_from_json($data);
}
@@ -71,7 +72,7 @@ class language_file_helper
public function get_language_data_from_composer_file($path)
{
$json_data = file_get_contents($path);
return $this->get_language_data_from_json(json_decode($json_data, true));
return $this->get_language_data_from_json(json_sanitizer::decode($json_data));
}
/**
@@ -101,7 +102,6 @@ class language_file_helper
return array(
'iso' => $data['extra']['language-iso'],
'name' => $data['extra']['english-name'],
'local_name' => $data['extra']['local-name'],
'author' => implode(', ', $authors),