mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

[ticket/10824] Add missing imports and adjust json sanitizer imports

Browse Source 
This way the imports will also be a bit more explicit to the fact
that this is only a json sanitizer.

PHPBB3-10824
This commit is contained in:
Marc Alexander
2021-01-18 21:06:58 +01:00
parent cf8f79356d
commit c93da86f83
5 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/phpbb/db/migration/data/v310/style_update_p1.php
View File

@@ -13,7 +13,7 @@
namespace phpbb\db\migration\data\v310;
use phpbb\json\sanitizer;
use phpbb\json\sanitizer as json_sanitizer;
class style_update_p1 extends \phpbb\db\migration\migration
{
@@ -85,7 +85,7 @@ class style_update_p1 extends \phpbb\db\migration\migration
else if (file_exists($fileinfo->getPathname() . '/composer.json'))
{
$json = file_get_contents($fileinfo->getPathname() . '/composer.json');
$style_data = sanitizer::decode($json);
$style_data = json_sanitizer::decode($json);
if (isset($style_data['extra']['phpbb-version']) && version_compare($style_data['extra']['phpbb-version'], '4.0.0-dev', '>='))
{
// 4.x style