Author: kevinshen Date: 2010-03-29 05:31:30 +0200 (Mon, 29 Mar 2010) New Revision: 41649
Modified: CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/PortalErrorServlet.java Log: CMSC-1459 Problem with previewing content that isnt linked to a page Modified: CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/PortalErrorServlet.java =================================================================== --- CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/PortalErrorServlet.java 2010-03-26 17:06:48 UTC (rev 41648) +++ CMSContainer/trunk/CMSContainer/cmsc/portal/src/java/com/finalist/cmsc/portalImpl/PortalErrorServlet.java 2010-03-29 03:31:30 UTC (rev 41649) @@ -123,7 +123,14 @@ } } else { - if(statusCode == 404 && !ServerUtil.useServerName()) { + List<Site> sites = SiteManagement.getSites(); + for (Site site2 : sites) { + if (SiteManagement.isNavigation(site2.getUrlfragment() + PATH_SP + statusCode)) { + errorPageSite = site2; + break; + } + } + if(statusCode == 404 && ServerUtil.isStaging() && !ServerUtil.useServerName()) { Matcher m = FILE_PATTERN.matcher(path); String redirectPath = ""; if (m.matches()) { @@ -139,13 +146,6 @@ return; } } - List<Site> sites = SiteManagement.getSites(); - for (Site site2 : sites) { - if (SiteManagement.isNavigation(site2.getUrlfragment() + PATH_SP + statusCode)) { - errorPageSite = site2; - break; - } - } } logError(request); if (errorPageSite != null) { _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs