Author: jvelociter
Date: 2008-02-19 01:20:04 +0100 (Tue, 19 Feb 2008)
New Revision: 7808

Modified:
   
xwiki-platform/xwiki-plugins/trunk/spacemanager/src/main/java/com/xpn/xwiki/plugin/spacemanager/impl/SpaceManagerImpl.java
Log:
XPSM-6
Patch submited by Marius Florea. Applied without modifications.


Modified: 
xwiki-platform/xwiki-plugins/trunk/spacemanager/src/main/java/com/xpn/xwiki/plugin/spacemanager/impl/SpaceManagerImpl.java
===================================================================
--- 
xwiki-platform/xwiki-plugins/trunk/spacemanager/src/main/java/com/xpn/xwiki/plugin/spacemanager/impl/SpaceManagerImpl.java
  2008-02-18 23:59:58 UTC (rev 7807)
+++ 
xwiki-platform/xwiki-plugins/trunk/spacemanager/src/main/java/com/xpn/xwiki/plugin/spacemanager/impl/SpaceManagerImpl.java
  2008-02-19 00:20:04 UTC (rev 7808)
@@ -1591,12 +1591,12 @@
                        toUsers = (String[]) admins.toArray(new 
String[admins.size()]);
                } else if (SpaceAction.JOIN.equals(action)) {
                        // send join group confirmation e-mail
-            SpaceUserProfile profile =
-                getSpaceUserProfile(space.getSpaceName(), context.getUser(), 
context);
-            if (profile != null && profile.getAllowNotifications()) {
+            boolean optOutEmail =
+                context.getWiki().getUserPreferenceAsInt("opt_out", context) 
!= 0;
+            if (optOutEmail) {
+                return;
+            } else {
                 toUsers = new String[] {context.getUser()};
-            } else {
-                return;
             }
                }
 

_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications

Reply via email to