makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6767 from marc1706/ticket/17450

Browse source 
[ticket/17450] Remove check for json extension as this is part of default PHP
This commit is contained in:
Marc Alexander 2025-01-02 15:35:44 +01:00 • committed by GitHub
commit 4d61c52a46
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 0 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/language/en/install.php
View file

@ -110,8 +110,6 @@ $lang = array_merge($lang, array(
'PHP_GETIMAGESIZE_SUPPORT_EXPLAIN' => 'In order for phpBB to function correctly, the getimagesize function needs to be available.', 'PHP_GETIMAGESIZE_SUPPORT_EXPLAIN' => 'In order for phpBB to function correctly, the getimagesize function needs to be available.',
'PCRE_UTF_SUPPORT' => 'PCRE UTF-8 support', 'PCRE_UTF_SUPPORT' => 'PCRE UTF-8 support',
'PCRE_UTF_SUPPORT_EXPLAIN' => 'phpBB will not run if your PHP installation is not compiled with UTF-8 support in the PCRE extension.', 'PCRE_UTF_SUPPORT_EXPLAIN' => 'phpBB will not run if your PHP installation is not compiled with UTF-8 support in the PCRE extension.',
'PHP_JSON_SUPPORT' => 'PHP JSON support',
'PHP_JSON_SUPPORT_EXPLAIN' => 'In order for phpBB to function correctly, the PHP JSON extension needs to be available.',
'PHP_MBSTRING_SUPPORT' => 'PHP mbstring support', 'PHP_MBSTRING_SUPPORT' => 'PHP mbstring support',
'PHP_MBSTRING_SUPPORT_EXPLAIN' => 'In order for phpBB to function correctly, the PHP mbstring extension needs to be available.', 'PHP_MBSTRING_SUPPORT_EXPLAIN' => 'In order for phpBB to function correctly, the PHP mbstring extension needs to be available.',
'PHP_XML_SUPPORT' => 'PHP XML/DOM support', 'PHP_XML_SUPPORT' => 'PHP XML/DOM support',

19
phpBB/phpbb/install/module/requirements/task/check_server_environment.php
View file

@ -68,9 +68,6 @@ class check_server_environment extends \phpbb\install\task_base
// Check for PCRE support // Check for PCRE support
$this->check_pcre(); $this->check_pcre();
// Check for JSON support
$this->check_json();
// Check for mbstring support // Check for mbstring support
$this->check_mbstring(); $this->check_mbstring();
@ -142,22 +139,6 @@ class check_server_environment extends \phpbb\install\task_base
$this->set_test_passed(false); $this->set_test_passed(false);
} }
/**
* Checks whether PHP's JSON extension is available or not
*/
protected function check_json()
{
if (@extension_loaded('json'))
{
$this->set_test_passed(true);
return;
}
$this->response_helper->add_error_message('PHP_JSON_SUPPORT', 'PHP_JSON_SUPPORT_EXPLAIN');
$this->set_test_passed(false);
}
/** /**
* Checks whether PHP's mbstring extension is available or not * Checks whether PHP's mbstring extension is available or not
*/ */