From 37a054897fe42179f65e1fa87db4720760a2d6fc Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sun, 21 Jun 2009 10:46:28 +0000 Subject: [PATCH] Fix bug #37235 - Correctly describe founder permissions on trace-information Authorised by: acydburn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9642 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + phpBB/language/en/acp/permissions.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 55eff22d74..47171ef4cb 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -123,6 +123,7 @@
  • [Fix] Do not throw an error when PDO is a shared module and not loaded preventing SQLite from being loaded.
  • [Fix] Fix unicode words wrong censoring. (Bug #16555 - Patch by rxu)
  • [Fix] Display coloured usernames in ACP groups management screens
    • +
  • [Fix] Correctly describe founder permissions on trace-information (Bug #37235 - Patch by nickvergessen)
  • [Fix] Correct the width value for poll_center.gif omitted in imageset.cfg for subsilver2. (Bug #43005 - Patch by rxu)
  • [Fix] Correctly load complex language variable using acp_language (Bug #45735 - Patch by leviatan21)
  • [Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.
    • diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php index 4ca11cf9db..929caf7d38 100644 --- a/phpBB/language/en/acp/permissions.php +++ b/phpBB/language/en/acp/permissions.php @@ -246,7 +246,7 @@ $lang = array_merge($lang, array( 'TRACE_USER_GLOBAL_YES_TOTAL_NEVER' => 'The forum independent user permission evaluates to YES which overwrites the current local result NEVER. %sTrace global permission%s', 'TRACE_USER_GLOBAL_NEVER_TOTAL_KEPT' => 'The forum independent user permission evaluates to NEVER which doesn’t influence the local permission. %sTrace global permission%s', - 'TRACE_USER_FOUNDER' => 'The user has the founder type set, therefore admin permissions are set to YES by default.', + 'TRACE_USER_FOUNDER' => 'The user is a founder, therefore admin permissions are always set to YES.', 'TRACE_USER_KEPT' => 'The user’s permission is NO so the old total value is kept.', 'TRACE_USER_KEPT_LOCAL' => 'The user’s permission for this forum is NO so the old total value is kept.', 'TRACE_USER_NEVER_TOTAL_NEVER' => 'The user’s permission is set to NEVER and the total value is set to NEVER, so nothing is changed.',