diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-03-31 14:58:14 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-03-31 14:58:14 +0000 |
| commit | 3e42df098cedbd4c70f893ea23de7f06df519fe2 (patch) | |
| tree | df5d5b407cf15af4219b244c79d530bc3e1424ba /phpBB/includes/mcp/mcp_forum.php | |
| parent | 45c97a40d268ec2be7e3300a46a2068e75f5ce52 (diff) | |
| download | forums-3e42df098cedbd4c70f893ea23de7f06df519fe2.tar forums-3e42df098cedbd4c70f893ea23de7f06df519fe2.tar.gz forums-3e42df098cedbd4c70f893ea23de7f06df519fe2.tar.bz2 forums-3e42df098cedbd4c70f893ea23de7f06df519fe2.tar.xz forums-3e42df098cedbd4c70f893ea23de7f06df519fe2.zip | |
merging some changes
git-svn-id: file:///svn/phpbb/trunk@8484 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/mcp/mcp_forum.php')
| -rw-r--r-- | phpBB/includes/mcp/mcp_forum.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php index 3bc4e9cf03..eec428a70b 100644 --- a/phpBB/includes/mcp/mcp_forum.php +++ b/phpBB/includes/mcp/mcp_forum.php @@ -164,7 +164,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info) $sql = "SELECT t.*$read_tracking_select FROM " . TOPICS_TABLE . " t $read_tracking_join - WHERE " . $db->sql_in_set('t.topic_id', $topic_list); + WHERE " . $db->sql_in_set('t.topic_id', $topic_list, false, true); $result = $db->sql_query($sql); while ($row = $db->sql_fetchrow($result)) @@ -389,7 +389,7 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id) return; } - $redirect = request_var('redirect', build_url(array('_f_', 'quickmod'))); + $redirect = request_var('redirect', build_url(array('quickmod'))); $s_hidden_fields = build_hidden_fields(array( 'i' => 'main', |