[Xfce4-commits] <forum:master> Fix forum cleanup plugins.

[Nick Schermer]

Updating branch refs/heads/master
         to c82197a45b1db0fb5552beb210343cecb03b4eaa (commit)
       from 57a18d1b64f7775268f575b81676b806d2b266a6 (commit)

commit c82197a45b1db0fb5552beb210343cecb03b4eaa
Author: Nick Schermer <nick at xfce.org>
Date:   Tue May 24 19:31:57 2011 +0200

    Fix forum cleanup plugins.

 plugins/AMP_Inactive_users.php |    3 ++-
 plugins/AMP_Profile_spam.php   |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/AMP_Inactive_users.php b/plugins/AMP_Inactive_users.php
index 1dcce64..0bcbd0f 100644
--- a/plugins/AMP_Inactive_users.php
+++ b/plugins/AMP_Inactive_users.php
@@ -35,7 +35,8 @@ if (isset($_POST['delete-users']) && is_array($_POST['delete-users']))
 		}
 
 		// Delete any subscriptions
-		$db->query('DELETE FROM '.$db->prefix.'subscriptions WHERE user_id='.$user) or error('Unable to delete subscriptions', __FILE__, __LINE__, $db->error());
+		$db->query('DELETE FROM '.$db->prefix.'forum_subscriptions WHERE user_id='.$user) or error('Unable to delete forum subscriptions', __FILE__, __LINE__, $db->error());
+		$db->query('DELETE FROM '.$db->prefix.'topic_subscriptions WHERE user_id='.$user) or error('Unable to delete topic subscriptions', __FILE__, __LINE__, $db->error());
 
 		// Remove him/her from the online list (if they happen to be logged in)
 		$db->query('DELETE FROM '.$db->prefix.'online WHERE user_id='.$user) or error('Unable to remove user from online list', __FILE__, __LINE__, $db->error());
diff --git a/plugins/AMP_Profile_spam.php b/plugins/AMP_Profile_spam.php
index a063dc7..6ae9889 100644
--- a/plugins/AMP_Profile_spam.php
+++ b/plugins/AMP_Profile_spam.php
@@ -36,7 +36,8 @@ if (isset($_POST['delete-users']) && is_array($_POST['delete-users']))
 		}
 
 		// Delete any subscriptions
-		$db->query('DELETE FROM '.$db->prefix.'subscriptions WHERE user_id='.$user) or error('Unable to delete subscriptions', __FILE__, __LINE__, $db->error());
+		$db->query('DELETE FROM '.$db->prefix.'forum_subscriptions WHERE user_id='.$user) or error('Unable to delete forum subscriptions', __FILE__, __LINE__, $db->error());
+		$db->query('DELETE FROM '.$db->prefix.'topic_subscriptions WHERE user_id='.$user) or error('Unable to delete topic subscriptions', __FILE__, __LINE__, $db->error());
 
 		// Remove him/her from the online list (if they happen to be logged in)
 		$db->query('DELETE FROM '.$db->prefix.'online WHERE user_id='.$user) or error('Unable to remove user from online list', __FILE__, __LINE__, $db->error());