Merge pull request sakaiproject#1159 from juanarcadio/SAK-29950

SAK-29950 Internal Server Error when click over All site files
jayrp11 · Oct 9, 2015 · db6b46e · db6b46e
2 parents eca26db + 0db5c51
commit db6b46e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/content/content-tool/tool/src/java/org/sakaiproject/content/tool/ResourcesAction.java b/content/content-tool/tool/src/java/org/sakaiproject/content/tool/ResourcesAction.java
@@ -3136,7 +3136,7 @@ protected static Collection<ContentPermissions> getPermissions(String id, Collec
 		}
 
 		// id may be in format of /group/<site_id>, which leads to null value for the reference context field
-		if (siteId == null)
+		if (siteId == null && ToolManager.getCurrentPlacement() != null)
 		{
 			siteId = ToolManager.getCurrentPlacement().getContext();
 		}