diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-07-26 16:12:21 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-07-26 16:12:21 +0200 |
| commit | cec4c94f2edff43508f20d8838399f4114557134 (patch) | |
| tree | a130a5bebdfb2d09de0de9293882ad74d6726333 /phpBB/includes/acp/acp_attachments.php | |
| parent | 8a264228d01215fe1020bf946fc95c804ba95450 (diff) | |
| parent | d1e56868667234b4d8ea61a79463c3e3e47efa80 (diff) | |
| download | forums-cec4c94f2edff43508f20d8838399f4114557134.tar forums-cec4c94f2edff43508f20d8838399f4114557134.tar.gz forums-cec4c94f2edff43508f20d8838399f4114557134.tar.bz2 forums-cec4c94f2edff43508f20d8838399f4114557134.tar.xz forums-cec4c94f2edff43508f20d8838399f4114557134.zip | |
Merge remote-tracking branch 'upstream/develop' into feature/dic
* upstream/develop: (39 commits)
[ticket/11025] Add underline for hover to classes
[ticket/11025] Replace <b> with <strong> and/or class for semantic styling in subsilver2
[ticket/11025] Replace <b> with <strong> and/or class for semantic styling
[ticket/11025] Make last topic titles in forum list Bold
[prep-release-3.0.11] Update Changelog for 3.0.11-RC2 release.
[prep-release-3.0.11] Bumping version number for 3.0.11-RC2.
[ticket/10965] Profile data is only grabbed when show_novalue is enabled
[ticket/10965] Make sure all profile fields are always grabbed on viewtopic
[ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1
[ticket/10965] Introduce a new profile field option to display no value
[ticket/10990] Changes for develop
[ticket/10990] Do not use comma separator when storing it as a log.
[ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriate
[ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)
[ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)
[ticket/11012] Fix php_ext change in mock_extension_manager
[ticket/11012] Normalize $phpEx member vars to $php_ext
[ticket/11002] Use translating option to rename the Etc/GMT options
[ticket/11009] Backport build.xml from develop to fix Bamboo Unit Testing.
[ticket/11008] Change onunload_functions to not use eval()
...
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 3433d7e2cd..eccc935a6e 100644 --- a/phpBB/includes/acp/acp_attachments.php +++ b/phpBB/includes/acp/acp_attachments.php @@ -98,7 +98,7 @@ class acp_attachments } $db->sql_freeresult($result); - $l_legend_cat_images = $user->lang['SETTINGS_CAT_IMAGES'] . ' [' . $user->lang['ASSIGNED_GROUP'] . ': ' . ((!empty($s_assigned_groups[ATTACHMENT_CATEGORY_IMAGE])) ? implode(', ', $s_assigned_groups[ATTACHMENT_CATEGORY_IMAGE]) : $user->lang['NO_EXT_GROUP']) . ']'; + $l_legend_cat_images = $user->lang['SETTINGS_CAT_IMAGES'] . ' [' . $user->lang['ASSIGNED_GROUP'] . ': ' . ((!empty($s_assigned_groups[ATTACHMENT_CATEGORY_IMAGE])) ? implode($user->lang['COMMA_SEPARATOR'], $s_assigned_groups[ATTACHMENT_CATEGORY_IMAGE]) : $user->lang['NO_EXT_GROUP']) . ']'; $display_vars = array( 'title' => 'ACP_ATTACHMENT_SETTINGS', @@ -917,7 +917,7 @@ class acp_attachments $db->sql_query($sql); add_log('admin', 'LOG_ATTACH_ORPHAN_DEL', implode(', ', $delete_files)); - $notify[] = sprintf($user->lang['LOG_ATTACH_ORPHAN_DEL'], implode(', ', $delete_files)); + $notify[] = sprintf($user->lang['LOG_ATTACH_ORPHAN_DEL'], implode($user->lang['COMMA_SEPARATOR'], $delete_files)); } $upload_list = array(); @@ -1074,7 +1074,7 @@ class acp_attachments $error[] = $user->lang['FILES_GONE']; } add_log('admin', 'LOG_ATTACHMENTS_DELETED', implode(', ', $deleted_filenames)); - $notify[] = sprintf($user->lang['LOG_ATTACHMENTS_DELETED'], implode(', ', $deleted_filenames)); + $notify[] = sprintf($user->lang['LOG_ATTACHMENTS_DELETED'], implode($user->lang['COMMA_SEPARATOR'], $deleted_filenames)); } else { |