- Handle forum links/redirects within viewforum if no read permission given (to display login box or error message) (Bug #13467)

- Prevent changing postable forum having subforums to link forum without moving subforums out first


git-svn-id: file:///svn/phpbb/trunk@7895 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/language/en/acp/common.php

@@ -402,6 +402,8 @@ $lang = array_merge($lang, array(
 	'LOG_ADMIN_AUTH_FAIL'		=> '<strong>Failed administration login attempt</strong>',
 	'LOG_ADMIN_AUTH_SUCCESS'	=> '<strong>Successful administration login</strong>',
 
+	'LOG_ATTACHMENTS_DELETED'	=> '<strong>Removed user attachments</strong><br />» %s',
+
 	'LOG_ATTACH_EXT_ADD'		=> '<strong>Added or edited attachment extension</strong><br />» %s',
 	'LOG_ATTACH_EXT_DEL'		=> '<strong>Removed attachment extension</strong><br />» %s',
 	'LOG_ATTACH_EXT_UPDATE'		=> '<strong>Updated attachment extension</strong><br />» %s',

phpBB/language/en/acp/forums.php

@@ -102,6 +102,8 @@ $lang = array_merge($lang, array(
 	'FORUM_TYPE'						=> 'Forum type',
 	'FORUM_UPDATED'						=> 'Forum information updated successfully.',
 
+	'FORUM_WITH_SUBFORUMS_NOT_TO_LINK'		=> 'You want to change a postable forum having subforums to a link. Please move all subforums out of this forum before you proceed, because after changing to a link you are no longer able to see the subforums currently connected to this forum.',
+
 	'GENERAL_FORUM_SETTINGS'	=> 'General forum settings',
 
 	'LINK'					=> 'Link',
@@ -126,7 +128,7 @@ $lang = array_merge($lang, array(
 	'PRUNE_STICKY'				=> 'Prune stickies',
 	'PRUNE_OLD_POLLS'			=> 'Prune old polls',
 	'PRUNE_OLD_POLLS_EXPLAIN'	=> 'Removes topics with polls not voted in for post age days.',
-	
+
 	'REDIRECT_ACL'	=> 'Now you are able to %sset permissions%s for this forum.',
 
 	'SYNC_IN_PROGRESS'			=> 'Synchronizing forum',