makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/10411] Fix logic error when editing/creating a group

Browse source 
PHPBB3-10411
This commit is contained in:
Joas Schilling 2012-11-14 19:06:42 +01:00
parent 59bb498de7
commit 60d831c392
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
phpBB/includes/functions_user.php
View file

@ -2570,7 +2570,7 @@ function phpbb_avatar_explanation_string()
*/ */
function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow_desc_bbcode = false, $allow_desc_urls = false, $allow_desc_smilies = false) function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow_desc_bbcode = false, $allow_desc_urls = false, $allow_desc_smilies = false)
{ {
global $phpbb_root_path, $config, $db, $user, $file_upload; global $phpbb_root_path, $config, $db, $user, $file_upload, $phpbb_container;
$error = array(); $error = array();
@ -2602,8 +2602,6 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow
$current_legend = phpbb_groupposition_legend::GROUP_DISABLED; $current_legend = phpbb_groupposition_legend::GROUP_DISABLED;
$current_teampage = phpbb_groupposition_teampage::GROUP_DISABLED; $current_teampage = phpbb_groupposition_teampage::GROUP_DISABLED;
global $phpbb_container;
$legend = $phpbb_container->get('groupposition.legend'); $legend = $phpbb_container->get('groupposition.legend');
$teampage = $phpbb_container->get('groupposition.teampage'); $teampage = $phpbb_container->get('groupposition.teampage');
if ($group_id) if ($group_id)
@ -2731,6 +2729,13 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow
$db->sql_query($sql); $db->sql_query($sql);
} }
// Remove the group from the teampage, only if unselected and we are editing a group,
// which is currently displayed.
if (!$group_teampage && $group_id && $current_teampage != phpbb_groupposition_teampage::GROUP_DISABLED)
{
$teampage->delete_group($group_id);
}
if (!$group_id) if (!$group_id)
{ {
$group_id = $db->sql_nextid(); $group_id = $db->sql_nextid();
@ -2741,6 +2746,11 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow
} }
} }
if ($group_teampage && $current_teampage == phpbb_groupposition_teampage::GROUP_DISABLED)
{
$teampage->add_group($group_id);
}
if ($group_teampage) if ($group_teampage)
{ {
if ($current_teampage == phpbb_groupposition_teampage::GROUP_DISABLED) if ($current_teampage == phpbb_groupposition_teampage::GROUP_DISABLED)