mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-30 21:40:43 +02:00
Unused Code inside function update_forum_data [Bug #6606]
Copy permissions protection for groups [Bug #6594] HTML issues in ACP [Bug #6580, #6578] Always send the correct encoding [related to bug #6576] Mass email fixes for first loop iteration [Bug #6570] Extension groups to be allowed in PM's and/or Posts [Bug #6558] Extension allowance checking clarified (no longer using forum id 0 for private messaging) Using request_var() array method for some variables [Bug #6556] Added confirmation for deletion of ranks/smilies/icons/word censores [Bug #6548, #6530, #6512, #6466] Only show postable forums in dropdown list for moving posts on forum deletion as well as correct re-indexing [Bug #6510, #6476, #6384] Jabber password being password field in jabber settings screen [Bug #6478] user activity language variable if viewing not own profile [Bug #6432] Show moderator group/user-name colour [Bug #6402] Log rank creation/updating/removing [Bug #6398] Update check permission changed from a_ to a_board [Bug #6392] git-svn-id: file:///svn/phpbb/trunk@6816 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -668,7 +668,7 @@ class acp_forums
|
||||
if ($db->sql_fetchrow($result))
|
||||
{
|
||||
$template->assign_vars(array(
|
||||
'S_MOVE_FORUM_OPTIONS' => make_forum_select($forum_data['parent_id'], $subforums_id)) // , false, true, false???
|
||||
'S_MOVE_FORUM_OPTIONS' => make_forum_select($forum_data['parent_id'], $subforums_id, false, true)) // , false, true, false???
|
||||
);
|
||||
}
|
||||
$db->sql_freeresult($result);
|
||||
@@ -989,7 +989,6 @@ class acp_forums
|
||||
|
||||
if ($action_subforums == 'delete')
|
||||
{
|
||||
$log_action_forums = 'FORUMS';
|
||||
$rows = get_forum_branch($row['forum_id'], 'children', 'descending', false);
|
||||
|
||||
foreach ($rows as $_row)
|
||||
@@ -1055,8 +1054,6 @@ class acp_forums
|
||||
return array($user->lang['NO_DESTINATION_FORUM']);
|
||||
}
|
||||
|
||||
$log_action_forums = 'MOVE_FORUMS';
|
||||
|
||||
$sql = 'SELECT forum_name
|
||||
FROM ' . FORUMS_TABLE . '
|
||||
WHERE forum_id = ' . $subforums_to_id;
|
||||
@@ -1115,11 +1112,9 @@ class acp_forums
|
||||
|
||||
if ($row['forum_name'] != $forum_data_sql['forum_name'])
|
||||
{
|
||||
// the forum name has changed, clear the parents list of child forums
|
||||
// the forum name has changed, clear the parents list of all forums (for safety)
|
||||
$sql = 'UPDATE ' . FORUMS_TABLE . "
|
||||
SET forum_parents = ''
|
||||
WHERE left_id > " . $row['left_id'] . '
|
||||
AND right_id < ' . $row['right_id'];
|
||||
SET forum_parents = ''";
|
||||
$db->sql_query($sql);
|
||||
}
|
||||
|
||||
@@ -1374,6 +1369,9 @@ class acp_forums
|
||||
}
|
||||
$db->sql_freeresult($result);
|
||||
|
||||
// Grab new forum data for correct tree updating later
|
||||
$forum_data = $this->get_forum_info($forum_id);
|
||||
|
||||
$sql = 'UPDATE ' . FORUMS_TABLE . "
|
||||
SET parent_id = $subforums_to_id
|
||||
WHERE parent_id = $forum_id";
|
||||
|
Reference in New Issue
Block a user