diff options
| author | Nils Adermann <naderman@naderman.de> | 2006-08-06 17:25:29 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2006-08-06 17:25:29 +0000 |
| commit | 8b079894f3e528c9ffe652f8f3a041599d8cbdc0 (patch) | |
| tree | 04efd5c2cf97e16a3540b9ff5c09a1944cf4b963 /phpBB/includes/acp/acp_attachments.php | |
| parent | 4af44652aced7c601cdfeff93dc03e6672e8b2c3 (diff) | |
| download | forums-8b079894f3e528c9ffe652f8f3a041599d8cbdc0.tar forums-8b079894f3e528c9ffe652f8f3a041599d8cbdc0.tar.gz forums-8b079894f3e528c9ffe652f8f3a041599d8cbdc0.tar.bz2 forums-8b079894f3e528c9ffe652f8f3a041599d8cbdc0.tar.xz forums-8b079894f3e528c9ffe652f8f3a041599d8cbdc0.zip | |
- finally making the age calculation work [Bug #3582]
- replacing all occurances of L_NONE with a more specific string [Bug #3494]
- a few corrections to html id attributes in the installer
- using correct permission in mcp_report [Bug #2471]
- allow deleting the avatar, when no upload method is enabled and hide the delete button if no avatar is set
git-svn-id: file:///svn/phpbb/trunk@6241 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_attachments.php')
| -rw-r--r-- | phpBB/includes/acp/acp_attachments.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php index 4c73f5ffa0..257edf57e8 100644 --- a/phpBB/includes/acp/acp_attachments.php +++ b/phpBB/includes/acp/acp_attachments.php @@ -78,7 +78,7 @@ class acp_attachments } $db->sql_freeresult($result); - $l_legend_cat_images = $user->lang['SETTINGS_CAT_IMAGES'] . ' [' . $user->lang['ASSIGNED_GROUP'] . ': ' . ((sizeof($s_assigned_groups[ATTACHMENT_CATEGORY_IMAGE])) ? implode(', ', $s_assigned_groups[ATTACHMENT_CATEGORY_IMAGE]) : $user->lang['NONE']) . ']'; + $l_legend_cat_images = $user->lang['SETTINGS_CAT_IMAGES'] . ' [' . $user->lang['ASSIGNED_GROUP'] . ': ' . ((sizeof($s_assigned_groups[ATTACHMENT_CATEGORY_IMAGE])) ? implode(', ', $s_assigned_groups[ATTACHMENT_CATEGORY_IMAGE]) : $user->lang['NO_EXT_GROUP']) . ']'; $display_vars = array( 'title' => 'ACP_ATTACHMENT_SETTINGS', @@ -521,7 +521,7 @@ class acp_attachments } $cat_lang = array( - ATTACHMENT_CATEGORY_NONE => $user->lang['NONE'], + ATTACHMENT_CATEGORY_NONE => $user->lang['NO_FILE_CAT'], ATTACHMENT_CATEGORY_IMAGE => $user->lang['CAT_IMAGES'], ATTACHMENT_CATEGORY_WM => $user->lang['CAT_WM_FILES'], ATTACHMENT_CATEGORY_RM => $user->lang['CAT_RM_FILES'] @@ -959,7 +959,7 @@ class acp_attachments global $db, $user; $types = array( - ATTACHMENT_CATEGORY_NONE => $user->lang['NONE'], + ATTACHMENT_CATEGORY_NONE => $user->lang['NO_FILE_CAT'], ATTACHMENT_CATEGORY_IMAGE => $user->lang['CAT_IMAGES'], ATTACHMENT_CATEGORY_WM => $user->lang['CAT_WM_FILES'], ATTACHMENT_CATEGORY_RM => $user->lang['CAT_RM_FILES'] |