1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-08 18:05:17 +02:00

Merge branch '3.2.x'

This commit is contained in:
Oliver Schramm 2016-07-30 23:23:00 +02:00
commit 46045eb9b0
2 changed files with 21 additions and 0 deletions

View File

@ -113,6 +113,8 @@ $lang = array_merge($lang, array(
'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_XML_SUPPORT' => 'PHP XML/DOM support',
'PHP_XML_SUPPORT_EXPLAIN' => 'In order for phpBB to function correctly, the PHP XML/DOM extension needs to be available.',
'PHP_SUPPORTED_DB' => 'Supported databases',
'PHP_SUPPORTED_DB_EXPLAIN' => 'You must have support for at least one compatible database within PHP. If no database modules are shown as available you should contact your hosting provider or review the relevant PHP installation documentation for advice.',

View File

@ -71,6 +71,9 @@ class check_server_environment extends \phpbb\install\task_base
// Check for JSON support
$this->check_json();
// XML extension support check
$this->check_xml();
// Check for dbms support
$this->check_available_dbms();
@ -154,6 +157,22 @@ class check_server_environment extends \phpbb\install\task_base
$this->set_test_passed(false);
}
/**
* Checks whether or not the XML PHP extension is available (Required by the text formatter)
*/
protected function check_xml()
{
if (class_exists('DOMDocument'))
{
$this->set_test_passed(true);
return;
}
$this->response_helper->add_error_message('PHP_XML_SUPPORT', 'PHP_XML_SUPPORT_EXPLAIN');
$this->set_test_passed(false);
}
/**
* Check if any supported DBMS is available
*/