diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-27 17:33:27 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-27 17:33:27 +0000 |
| commit | acf0c0ddebf13b6075b6dac81c7675dd04d4a692 (patch) | |
| tree | b2452341efa35b710560ea75e70401b0f5c474c2 /phpBB/includes/mcp/mcp_forum.php | |
| parent | 92c25a3e6c99bb071710b2f5dc5939262924233c (diff) | |
| download | forums-acf0c0ddebf13b6075b6dac81c7675dd04d4a692.tar forums-acf0c0ddebf13b6075b6dac81c7675dd04d4a692.tar.gz forums-acf0c0ddebf13b6075b6dac81c7675dd04d4a692.tar.bz2 forums-acf0c0ddebf13b6075b6dac81c7675dd04d4a692.tar.xz forums-acf0c0ddebf13b6075b6dac81c7675dd04d4a692.zip | |
err, forgot to commit
git-svn-id: file:///svn/phpbb/trunk@7961 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/mcp/mcp_forum.php')
| -rw-r--r-- | phpBB/includes/mcp/mcp_forum.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php index 4059e77d39..d4c6f1f395 100644 --- a/phpBB/includes/mcp/mcp_forum.php +++ b/phpBB/includes/mcp/mcp_forum.php @@ -396,7 +396,7 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id) // If the topic no longer exist, we will update the topic watch table. // To not let it error out on users watching both topics, we just return on an error... $db->sql_return_on_error(true); - $db->sql_query('UPDATE ' . TOPICS_WATCH_TABLE . ' SET topic_id = ' . $to_topic_id . ' WHERE ' . $db->sql_in_set('topic_id', $topic_ids)); + $db->sql_query('UPDATE ' . TOPICS_WATCH_TABLE . ' SET topic_id = ' . (int) $to_topic_id . ' WHERE ' . $db->sql_in_set('topic_id', $topic_ids)); $db->sql_return_on_error(false); $db->sql_query('DELETE FROM ' . TOPICS_WATCH_TABLE . ' WHERE ' . $db->sql_in_set('topic_id', $topic_ids)); |