Index: site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java =================================================================== --- site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java (revision 315413) +++ site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java (working copy) @@ -757,6 +757,8 @@ private static final String CONTEXT_HAS_TERMS = "hasTerms"; private static final String SAK_PROP_AUTO_FILTER_TERM = "site.setup.autoFilterTerm"; + + private static final String SAK_PROP_IMPORT_NOTIFICATION = "site.setup.import.notification"; // state variable for whether any multiple instance tool has been selected private String STATE_MULTIPLE_TOOL_INSTANCE_SELECTED = "state_multiple_tool_instance_selected"; @@ -2132,7 +2134,7 @@ if(state.getAttribute(IMPORT_QUEUED) != null){ context.put("importQueued", true); state.removeAttribute(IMPORT_QUEUED); - if(UserDirectoryService.getCurrentUser().getEmail() == null || "".equals(UserDirectoryService.getCurrentUser().getEmail())){ + if(UserDirectoryService.getCurrentUser().getEmail() == null || "".equals(UserDirectoryService.getCurrentUser().getEmail()) || !ServerConfigurationService.getBoolean(SAK_PROP_IMPORT_NOTIFICATION, true)){ context.put("importQueuedNoEmail", true); } } @@ -8850,7 +8852,7 @@ existingSite = getStateSite(state); // refresh site for // WC and News commitSite(existingSite); - if (ServerConfigurationService.getBoolean("site.setup.import.notification", true)) { + if (ServerConfigurationService.getBoolean(SAK_PROP_IMPORT_NOTIFICATION, true)) { userNotificationProvider.notifySiteImportCompleted(userEmail, existingSite.getId(), existingSite.getTitle()); } EventTrackingService.post(EventTrackingService.newEvent(SiteService.EVENT_SITE_IMPORT_END, existingSite.getReference(), false)); @@ -8915,7 +8917,7 @@ SessionManager.setCurrentToolSession(toolSession); // Remove all old contents before importing contents from new site importToolIntoSiteMigrate(selectedTools, importTools, existingSite); - if (ServerConfigurationService.getBoolean("site.setup.import.notification", true)) { + if (ServerConfigurationService.getBoolean(SAK_PROP_IMPORT_NOTIFICATION, true)) { userNotificationProvider.notifySiteImportCompleted(userEmail, existingSite.getId(), existingSite.getTitle()); } EventTrackingService.post(EventTrackingService.newEvent(SiteService.EVENT_SITE_IMPORT_END, existingSite.getReference(), false));