Author: raintang
Date: 2009-09-27 03:51:46 +0200 (Sun, 27 Sep 2009)
New Revision: 38868
Modified:
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
Log:
CMSC-1543 When a community user is deleted, subscriptionrecords are not removed
from live
Modified:
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
===================================================================
---
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
2009-09-27 01:51:29 UTC (rev 38867)
+++
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
2009-09-27 01:51:46 UTC (rev 38868)
@@ -463,8 +463,12 @@
SearchUtil.addEqualConstraint(query,
recordManager.getField("subscriber"), String.valueOf(anthId));
List<Node> subscriptions = query.getList();
for (Node subscription : subscriptions) {
- if (Publish.isPublished(subscription)) {
- Publish.unpublish(subscription);
+ if (ServerUtil.isStaging()) {
+ if (Publish.isPublished(subscription)) {
+ Publish.unpublish(subscription);
+ }
+ } else if (ServerUtil.isLive()) {
+ Publish.unpublish(subscription);
}
subscription.delete(true);
}
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
