Index: tool/src/java/org/sakaiproject/lessonbuildertool/tool/beans/SimplePageBean.java =================================================================== --- tool/src/java/org/sakaiproject/lessonbuildertool/tool/beans/SimplePageBean.java (revision 3286) +++ tool/src/java/org/sakaiproject/lessonbuildertool/tool/beans/SimplePageBean.java (revision 3287) @@ -5532,6 +5532,22 @@ cc = contentHostingService.getCollection(contentCollectionId); } + // UMU fix + // Make MAC OS X zips work + if (children.size() == 2 && children.get(0).endsWith("/") && children.get(1).endsWith("/")) { + String dataChild = null; + if (children.get(0).endsWith("__MACOSX/")) { + dataChild = children.get(1); + } else if (children.get(1).endsWith("__MACOSX/")) { + dataChild = children.get(0); + } + + if (dataChild != null) { + contentCollectionId = dataChild; + cc = contentHostingService.getCollection(contentCollectionId); + } + } + // Now lets work out what type it is and return the appropriate // index url