Author: mflorea
Date: 2008-01-04 12:50:20 +0100 (Fri, 04 Jan 2008)
New Revision: 6625
Modified:
xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/impl/InvitationManagerImpl.java
Log:
Look for "invitation_email" and then from "admin_email" when sending an
invitation
Modified:
xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/impl/InvitationManagerImpl.java
===================================================================
---
xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/impl/InvitationManagerImpl.java
2008-01-04 11:37:23 UTC (rev 6624)
+++
xwiki-products/curriki/trunk/plugins/invitationmanager/src/main/java/org/xwiki/plugin/invitationmanager/impl/InvitationManagerImpl.java
2008-01-04 11:50:20 UTC (rev 6625)
@@ -1275,7 +1275,10 @@
SpaceManager spaceManager =
SpaceManagers.findSpaceManagerForSpace(spaceName, context);
Space space = spaceManager.getSpace(spaceName, context);
vContext.put(SPACE_VELOCITY_KEY, space);
- String fromUser = context.getWiki().getXWikiPreference("admin_email",
context);
+ String fromUser =
context.getWiki().getXWikiPreference("invitation_email", context);
+ if (fromUser == null) {
+ fromUser = context.getWiki().getXWikiPreference("admin_email",
context);
+ }
String[] toUsers = new String[0];
if (request instanceof Invitation) {
Invitation invitation = (Invitation) request;
_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications
