diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-07-13 13:16:58 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-07-13 13:16:58 -0400 |
| commit | 0ef95a7009f48960a317f406f4d9e95c58b34d6f (patch) | |
| tree | 8b7864a2e10a8a046fc591865df3254f2ffa3798 /phpBB/language/en/acp/common.php | |
| parent | 1783134217830223edfe9bde616e424c4974b6af (diff) | |
| parent | 034155531446acd13b497cd25fa7528ce7cdf9c6 (diff) | |
| download | forums-0ef95a7009f48960a317f406f4d9e95c58b34d6f.tar forums-0ef95a7009f48960a317f406f4d9e95c58b34d6f.tar.gz forums-0ef95a7009f48960a317f406f4d9e95c58b34d6f.tar.bz2 forums-0ef95a7009f48960a317f406f4d9e95c58b34d6f.tar.xz forums-0ef95a7009f48960a317f406f4d9e95c58b34d6f.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11112] Do not change opensource.org link to https
[ticket/11112] Use https for user-visible links to phpbb.com
Conflicts:
phpBB/language/en/install.php
phpBB/language/en/ucp.php
Diffstat (limited to 'phpBB/language/en/acp/common.php')
| -rw-r--r-- | phpBB/language/en/acp/common.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index d128caca63..9c470efcd9 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -311,7 +311,7 @@ $lang = array_merge($lang, array( // PHP info $lang = array_merge($lang, array( - 'ACP_PHP_INFO_EXPLAIN' => 'This page lists information on the version of PHP installed on this server. It includes details of loaded modules, available variables and default settings. This information may be useful when diagnosing problems. Please be aware that some hosting companies will limit what information is displayed here for security reasons. You are advised to not give out any details on this page except when asked by <a href="http://www.phpbb.com/about/team/">official team members</a> on the support forums.', + 'ACP_PHP_INFO_EXPLAIN' => 'This page lists information on the version of PHP installed on this server. It includes details of loaded modules, available variables and default settings. This information may be useful when diagnosing problems. Please be aware that some hosting companies will limit what information is displayed here for security reasons. You are advised to not give out any details on this page except when asked by <a href="https://www.phpbb.com/about/team/">official team members</a> on the support forums.', 'NO_PHPINFO_AVAILABLE' => 'Information about your PHP configuration is unable to be determined. Phpinfo() has been disabled for security reasons.', )); |