aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_forums.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-08-03 15:23:34 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-08-03 15:23:34 +0000
commit82f42bb5fa611e790e02bc679b88ce90b3f8156b (patch)
tree7cb7cf746da4fd979569dc41dcec96db5f5c9acd /phpBB/includes/acp/acp_forums.php
parent650007a5f18e0538b27bf93d674c264fef58c506 (diff)
downloadforums-82f42bb5fa611e790e02bc679b88ce90b3f8156b.tar
forums-82f42bb5fa611e790e02bc679b88ce90b3f8156b.tar.gz
forums-82f42bb5fa611e790e02bc679b88ce90b3f8156b.tar.bz2
forums-82f42bb5fa611e790e02bc679b88ce90b3f8156b.tar.xz
forums-82f42bb5fa611e790e02bc679b88ce90b3f8156b.zip
- custom profile field fixed
- fixing sql_fetchfield from cache - changing the quote parser. In my tests i have not seen changed behaviour - but i might have broken something with this change. git-svn-id: file:///svn/phpbb/trunk@6232 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_forums.php')
-rw-r--r--phpBB/includes/acp/acp_forums.php10
1 files changed, 2 insertions, 8 deletions
diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php
index 8542d44301..ac461772d6 100644
--- a/phpBB/includes/acp/acp_forums.php
+++ b/phpBB/includes/acp/acp_forums.php
@@ -1082,7 +1082,7 @@ class acp_forums
{
global $db;
- $table_ary = array(LOG_TABLE, POSTS_TABLE, TOPICS_TABLE, DRAFTS_TABLE, TOPICS_TRACK_TABLE);
+ $table_ary = array(ACL_GROUPS_TABLE, ACL_USERS_TABLE, LOG_TABLE, POSTS_TABLE, TOPICS_TABLE, DRAFTS_TABLE, TOPICS_TRACK_TABLE);
foreach ($table_ary as $table)
{
@@ -1123,6 +1123,7 @@ class acp_forums
$errors = array();
$log_action_posts = $log_action_forums = $posts_to_name = $subforums_to_name = '';
+ $forum_ids = array($forum_id);
if ($action_posts == 'delete')
{
@@ -1166,8 +1167,6 @@ class acp_forums
if ($action_subforums == 'delete')
{
$log_action_forums = 'FORUMS';
-
- $forum_ids = array($forum_id);
$rows = get_forum_branch($forum_id, 'children', 'descending', false);
foreach ($rows as $row)
@@ -1259,11 +1258,6 @@ class acp_forums
WHERE left_id > {$forum_data['right_id']}";
$db->sql_query($sql);
- if (!isset($forum_ids) || !is_array($forum_ids))
- {
- $forum_ids = array($forum_id);
- }
-
// Delete forum ids from extension groups table
$sql = 'SELECT group_id, allowed_forums
FROM ' . EXTENSION_GROUPS_TABLE;