mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 22:28:51 +00:00
If you were guessing these were fixes then ... HAH! ... you were ... right.
git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@3135 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
0ea2745777
commit
c513153d43
2 changed files with 9 additions and 2 deletions
|
@ -116,7 +116,7 @@ h3 {font-size:12pt;color:blue}
|
||||||
<li>Changed user topic notification default in schemas to 0 (off)</li>
|
<li>Changed user topic notification default in schemas to 0 (off)</li>
|
||||||
<li>Fixed non-XHTML compliant img tags in privmsg.php</li>
|
<li>Fixed non-XHTML compliant img tags in privmsg.php</li>
|
||||||
<li>Fixed non-deletion of announcements and polls when removing forum contents in forum admin</li>
|
<li>Fixed non-deletion of announcements and polls when removing forum contents in forum admin</li>
|
||||||
<li></li>
|
<li>Fixed non-pruning of watched topics table when pruning related topics</li>
|
||||||
<li></li>
|
<li></li>
|
||||||
<li></li>
|
<li></li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
|
@ -76,9 +76,16 @@ function prune($forum_id, $prune_date, $prune_all = false;)
|
||||||
|
|
||||||
if ( $sql_post != '' )
|
if ( $sql_post != '' )
|
||||||
{
|
{
|
||||||
$sql = "DELETE FROM " . TOPICS_TABLE . "
|
$sql = "DELETE FROM " . TOPICS_WATCH_TABLE . "
|
||||||
WHERE topic_id IN ($sql_topics)";
|
WHERE topic_id IN ($sql_topics)";
|
||||||
if ( !$db->sql_query($sql, BEGIN_TRANSACTION) )
|
if ( !$db->sql_query($sql, BEGIN_TRANSACTION) )
|
||||||
|
{
|
||||||
|
message_die(GENERAL_ERROR, 'Could not delete watched topics during prune', '', __LINE__, __FILE__, $sql);
|
||||||
|
}
|
||||||
|
|
||||||
|
$sql = "DELETE FROM " . TOPICS_TABLE . "
|
||||||
|
WHERE topic_id IN ($sql_topics)";
|
||||||
|
if ( !$db->sql_query($sql) )
|
||||||
{
|
{
|
||||||
message_die(GENERAL_ERROR, 'Could not delete topics during prune', '', __LINE__, __FILE__, $sql);
|
message_die(GENERAL_ERROR, 'Could not delete topics during prune', '', __LINE__, __FILE__, $sql);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue