diff --git a/ccm-sci-bundle/src/com/arsdigita/bundle/ui/GenericOrgaUnitTabComponent.java b/ccm-sci-bundle/src/com/arsdigita/bundle/ui/GenericOrgaUnitTabComponent.java index c96bfa392..97dbff075 100644 --- a/ccm-sci-bundle/src/com/arsdigita/bundle/ui/GenericOrgaUnitTabComponent.java +++ b/ccm-sci-bundle/src/com/arsdigita/bundle/ui/GenericOrgaUnitTabComponent.java @@ -59,7 +59,8 @@ public class GenericOrgaUnitTabComponent extends AbstractComponent { GenericOrganizationalUnit orgaunit = (GenericOrganizationalUnit) DomainObjectFactory. newInstance(orgaunitOid); - if (!DispatcherHelper.getDispatcherPrefix(request).equals("preview")) { + if ((DispatcherHelper.getDispatcherPrefix(request) == null) + || !DispatcherHelper.getDispatcherPrefix(request).equals("preview")) { orgaunit = (GenericOrganizationalUnit) orgaunit.getLiveVersion(); } diff --git a/ccm-sci-publications/src/ccm-sci-publications.upgrade b/ccm-sci-publications/src/ccm-sci-publications.upgrade index 75ed4ddf1..1d7981863 100644 --- a/ccm-sci-publications/src/ccm-sci-publications.upgrade +++ b/ccm-sci-publications/src/ccm-sci-publications.upgrade @@ -2,4 +2,7 @@