diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-05-14 02:44:19 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-05-14 02:44:19 +0200 |
| commit | fa5845e8c582c903ec1ef4a78844cb6d77cd96b7 (patch) | |
| tree | 0bf0cb16cbe05a92a436bb0fe659a90cc64ceb7e /phpBB/includes | |
| parent | be1c5503443c305dd7f0064631dd73e37673fd7a (diff) | |
| parent | 58dc5a191c0203ea6d98c37df26b0830b3bf8203 (diff) | |
| download | forums-fa5845e8c582c903ec1ef4a78844cb6d77cd96b7.tar forums-fa5845e8c582c903ec1ef4a78844cb6d77cd96b7.tar.gz forums-fa5845e8c582c903ec1ef4a78844cb6d77cd96b7.tar.bz2 forums-fa5845e8c582c903ec1ef4a78844cb6d77cd96b7.tar.xz forums-fa5845e8c582c903ec1ef4a78844cb6d77cd96b7.zip | |
Merge branch 'ticket/nickvergessen/7717' into develop-olympus
* ticket/nickvergessen/7717:
[ticket/7717] Localise default extension groups for attachments
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_attachments.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php index 25e51814c4..980558c830 100644 --- a/phpBB/includes/acp/acp_attachments.php +++ b/phpBB/includes/acp/acp_attachments.php @@ -90,6 +90,7 @@ class acp_attachments $s_assigned_groups = array(); while ($row = $db->sql_fetchrow($result)) { + $row['group_name'] = (isset($user->lang['EXT_GROUP_' . $row['group_name']])) ? $user->lang['EXT_GROUP_' . $row['group_name']] : $row['group_name']; $s_assigned_groups[$row['cat_id']][] = $row['group_name']; } $db->sql_freeresult($result); @@ -494,6 +495,10 @@ class acp_attachments $sql = 'SELECT group_id FROM ' . EXTENSION_GROUPS_TABLE . " WHERE LOWER(group_name) = '" . $db->sql_escape(utf8_strtolower($new_group_name)) . "'"; + if ($group_id) + { + $sql .= ' AND group_id <> ' . $group_id; + } $result = $db->sql_query($sql); if ($db->sql_fetchrow($result)) @@ -551,6 +556,7 @@ class acp_attachments $group_id = $db->sql_nextid(); } + $group_name = (isset($user->lang['EXT_GROUP_' . $group_name])) ? $user->lang['EXT_GROUP_' . $group_name] : $group_name; add_log('admin', 'LOG_ATTACH_EXTGROUP_' . strtoupper($action), $group_name); } @@ -858,7 +864,7 @@ class acp_attachments 'U_EDIT' => $this->u_action . "&action=edit&g={$row['group_id']}", 'U_DELETE' => $this->u_action . "&action=delete&g={$row['group_id']}", - 'GROUP_NAME' => $row['group_name'], + 'GROUP_NAME' => (isset($user->lang['EXT_GROUP_' . $row['group_name']])) ? $user->lang['EXT_GROUP_' . $row['group_name']] : $row['group_name'], 'CATEGORY' => $cat_lang[$row['cat_id']], ) ); @@ -1118,6 +1124,7 @@ class acp_attachments $group_name = array(); while ($row = $db->sql_fetchrow($result)) { + $row['group_name'] = (isset($user->lang['EXT_GROUP_' . $row['group_name']])) ? $user->lang['EXT_GROUP_' . $row['group_name']] : $row['group_name']; $group_name[] = $row; } $db->sql_freeresult($result); |