Merge pull request sakaiproject#281 from buckett/SAK-28187

SAK-28187 Fix Edit Tools when Site type is empty.
susowrc · Mar 12, 2015 · 614abb7 · 614abb7
2 parents 3921049 + 9511d5f
commit 614abb7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java b/site-manage/site-manage-tool/tool/src/java/org/sakaiproject/site/tool/SiteAction.java
@@ -381,7 +381,7 @@ public class SiteAction extends PagedResourceActionII {
 	private final static String SITE_DEFAULT_LIST = ServerConfigurationService
 			.getString("site.types");
 
-	private final static String DEFAULT_SITE_TYPE_SAK_PROP = ServerConfigurationService.getString("site.types.defaultType");
+	private final static String DEFAULT_SITE_TYPE_SAK_PROP = ServerConfigurationService.getString("site.types.defaultType", null);
 	private final static String[] PUBLIC_CHANGEABLE_SITE_TYPES_SAK_PROP = ServerConfigurationService.getStrings("site.types.publicChangeable");
 	private final static String[] PUBLIC_SITE_TYPES_SAK_PROP = ServerConfigurationService.getStrings("site.types.publicOnly");
 	private final static String[] PRIVATE_SITE_TYPES_SAK_PROP = ServerConfigurationService.getStrings("site.types.privateOnly");