aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_groups.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2012-11-13 16:10:21 +0100
committerJoas Schilling <nickvergessen@gmx.de>2012-11-14 02:01:15 +0100
commit6e286218ec51487e036c9dc74876f90f1db9b6d1 (patch)
treefc340b50e5886b59c15bc221a4d637ef12bfd6bd /phpBB/includes/acp/acp_groups.php
parent6a27a95f30f7dafffe994aceb75a3cf769d13221 (diff)
downloadforums-6e286218ec51487e036c9dc74876f90f1db9b6d1.tar
forums-6e286218ec51487e036c9dc74876f90f1db9b6d1.tar.gz
forums-6e286218ec51487e036c9dc74876f90f1db9b6d1.tar.bz2
forums-6e286218ec51487e036c9dc74876f90f1db9b6d1.tar.xz
forums-6e286218ec51487e036c9dc74876f90f1db9b6d1.zip
[ticket/10411] Fix create_group and delete_group functions
PHPBB3-10411
Diffstat (limited to 'phpBB/includes/acp/acp_groups.php')
-rw-r--r--phpBB/includes/acp/acp_groups.php9
1 files changed, 6 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index dbdc044f7f..59f84f8c48 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -61,9 +61,11 @@ class acp_groups
// Grab basic data for group, if group_id is set and exists
if ($group_id)
{
- $sql = 'SELECT *
- FROM ' . GROUPS_TABLE . "
- WHERE group_id = $group_id";
+ $sql = 'SELECT g.*, t.teampage_position AS group_teampage
+ FROM ' . GROUPS_TABLE . ' g
+ LEFT JOIN ' . TEAMPAGE_TABLE . ' t
+ ON (t.group_id = g.group_id)
+ WHERE g.group_id = ' . $group_id;
$result = $db->sql_query($sql);
$group_row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
@@ -497,6 +499,7 @@ class acp_groups
}
$cache->destroy('sql', GROUPS_TABLE);
+ $cache->destroy('sql', TEAMPAGE_TABLE);
$message = ($action == 'edit') ? 'GROUP_UPDATED' : 'GROUP_CREATED';
trigger_error($user->lang[$message] . adm_back_link($this->u_action));