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

Fixed bugs #464065, #464064 and problem with topic without poll causing error when deleted

Browse source 
git-svn-id: file:///svn/phpbb/trunk@1071 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2001-09-24 21:35:11 +00:00
parent 002946350c
commit 0fd5f22a8e
1 changed files with 35 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
phpBB/modcp.php
View file

@ -257,7 +257,8 @@ switch($mode)
// //
$sql = "DELETE $sql = "DELETE
FROM " . TOPICS_TABLE . " FROM " . TOPICS_TABLE . "
WHERE topic_id IN ($topic_id_sql)"; WHERE topic_id IN ($topic_id_sql)
OR topic_moved_id IN ($topic_id_sql)";
if( !$result = $db->sql_query($sql, BEGIN_TRANSACTION) ) if( !$result = $db->sql_query($sql, BEGIN_TRANSACTION) )
{ {
message_die(GENERAL_ERROR, "Could not delete topics", "", __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, "Could not delete topics", "", __LINE__, __FILE__, $sql);
@ -279,36 +280,39 @@ switch($mode)
message_die(GENERAL_ERROR, "Could not delete posts text", "", __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, "Could not delete posts text", "", __LINE__, __FILE__, $sql);
} }
$sql = "DELETE if( $vote_id_sql != "" )
FROM " . VOTE_DESC_TABLE . "
WHERE vote_id IN ($vote_id_sql)";
if( !$result = $db->sql_query($sql) )
{ {
message_die(GENERAL_ERROR, "Could not delete vote descriptions", "", __LINE__, __FILE__, $sql); $sql = "DELETE
} FROM " . VOTE_DESC_TABLE . "
WHERE vote_id IN ($vote_id_sql)";
if( !$result = $db->sql_query($sql) )
{
message_die(GENERAL_ERROR, "Could not delete vote descriptions", "", __LINE__, __FILE__, $sql);
}
$sql = "DELETE $sql = "DELETE
FROM " . VOTE_RESULTS_TABLE . " FROM " . VOTE_RESULTS_TABLE . "
WHERE vote_id IN ($vote_id_sql)"; WHERE vote_id IN ($vote_id_sql)";
if( !$result = $db->sql_query($sql) ) if( !$result = $db->sql_query($sql) )
{ {
message_die(GENERAL_ERROR, "Could not delete vote results", "", __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, "Could not delete vote results", "", __LINE__, __FILE__, $sql);
} }
$sql = "DELETE $sql = "DELETE
FROM " . VOTE_USERS_TABLE . " FROM " . VOTE_USERS_TABLE . "
WHERE vote_id IN ($vote_id_sql)"; WHERE vote_id IN ($vote_id_sql)";
if( !$result = $db->sql_query($sql, END_TRANSACTION) ) if( !$result = $db->sql_query($sql, END_TRANSACTION) )
{ {
message_die(GENERAL_ERROR, "Could not delete vote users", "", __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, "Could not delete vote users", "", __LINE__, __FILE__, $sql);
}
} }
sync("forum", $forum_id); sync("forum", $forum_id);
if( !empty($topic_id) ) if( !empty($topic_id) )
{ {
$next_page = "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$moved_topic_id"; $next_page = "viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id";
$return_message = $lang['to_return_topic']; $return_message = $lang['to_return_forum'];
} }
else else
{ {
@ -395,41 +399,30 @@ switch($mode)
for($i = 0; $i < count($row); $i++) for($i = 0; $i < count($row); $i++)
{ {
$sql = "INSERT INTO " . TOPICS_TABLE . " (forum_id, topic_title, topic_poster, topic_time, topic_status, topic_type, topic_vote, topic_views, topic_replies, topic_last_post_id) $topic_id = $row[$i]['topic_id'];
VALUES ($new_forum_id, '" . $row[$i]['topic_title'] . "', '" . $row[$i]['topic_poster'] . "', " . $row[$i]['topic_time'] . ", " . $row[$i]['topic_status'] . ", " . $row[$i]['topic_type'] . ", " . $row[$i]['topic_vote'] . ", " . $row[$i]['topic_views'] . ", " . $row[$i]['topic_replies'] . ", " . $row[$i]['topic_last_post_id'] . ")";
$sql = "INSERT INTO " . TOPICS_TABLE . " (forum_id, topic_title, topic_poster, topic_time, topic_status, topic_type, topic_vote, topic_views, topic_replies, topic_last_post_id, topic_moved_id)
VALUES ($old_forum_id, '" . $row[$i]['topic_title'] . "', '" . $row[$i]['topic_poster'] . "', " . $row[$i]['topic_time'] . ", " . TOPIC_MOVED . ", " . POST_NORMAL . ", " . $row[$i]['topic_vote'] . ", " . $row[$i]['topic_views'] . ", " . $row[$i]['topic_replies'] . ", " . $row[$i]['topic_last_post_id'] . ", $topic_id)";
if( !$result = $db->sql_query($sql) ) if( !$result = $db->sql_query($sql) )
{ {
message_die(GENERAL_ERROR, "Could not insert new topic", "Error", __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, "Could not insert new topic", "Error", __LINE__, __FILE__, $sql);
} }
$moved_topic_id = $db->sql_nextid();
$sql = "UPDATE " . TOPICS_TABLE . " $sql = "UPDATE " . TOPICS_TABLE . "
SET topic_status = " . TOPIC_MOVED . ", topic_moved_id = $moved_topic_id SET forum_id = $new_forum_id
WHERE topic_id = " . $row[$i]['topic_id']; WHERE topic_id = $topic_id";
if( !$result = $db->sql_query($sql) ) if( !$result = $db->sql_query($sql) )
{ {
message_die(GENERAL_ERROR, "Could not update old topic", "Error", __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, "Could not update old topic", "Error", __LINE__, __FILE__, $sql);
} }
$sql = "UPDATE " . POSTS_TABLE . " $sql = "UPDATE " . POSTS_TABLE . "
SET forum_id = $new_forum_id, topic_id = $moved_topic_id SET forum_id = $new_forum_id
WHERE topic_id = " . $row[$i]['topic_id']; WHERE topic_id = $topic_id";
if( !$result = $db->sql_query($sql) ) if( !$result = $db->sql_query($sql) )
{ {
message_die(GENERAL_ERROR, "Could not update post topic ids", "Error", __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, "Could not update post topic ids", "Error", __LINE__, __FILE__, $sql);
} }
if( $row[$i]['topic_vote'] )
{
$sql = "UPDATE " . VOTE_DESC_TABLE . "
SET topic_id = $moved_topic_id
WHERE topic_id = " . $row[$i]['topic_id'];
if( !$result = $db->sql_query($sql) )
{
message_die(GENERAL_ERROR, "Could not update post topic ids", "Error", __LINE__, __FILE__, $sql);
}
}
} }
// Sync the forum indexes // Sync the forum indexes
@ -438,7 +431,7 @@ switch($mode)
if( !empty($topic_id) ) if( !empty($topic_id) )
{ {
$next_page = "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$moved_topic_id"; $next_page = "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id";
$return_message = $lang['to_return_topic']; $return_message = $lang['to_return_topic'];
} }
else else