Author: ssmiweve Date: 2008-02-21 13:50:31 +0100 (Thu, 21 Feb 2008) New Revision: 6159
Modified: branches/2.16/war/src/main/java/no/sesat/search/view/taglib/SearchTabMainTag.java Log: svn merge -c 6158 http://sesat.no/svn/sesat-kernel/branches/2.16.0 Modified: branches/2.16/war/src/main/java/no/sesat/search/view/taglib/SearchTabMainTag.java =================================================================== --- branches/2.16/war/src/main/java/no/sesat/search/view/taglib/SearchTabMainTag.java 2008-02-21 12:43:15 UTC (rev 6158) +++ branches/2.16/war/src/main/java/no/sesat/search/view/taglib/SearchTabMainTag.java 2008-02-21 12:50:31 UTC (rev 6159) @@ -99,6 +99,8 @@ try{ if(null != include){ + + include = include.startsWith("/") ? include : PAGES_DIRECTORY + include; final Map<String,Object> map = new HashMap<String,Object>(); map.put("layout", layout); @@ -116,7 +118,10 @@ importVelocity(include, map); } - }else{ + } + if(null == include + || Boolean.TRUE == cxt.getAttribute("Missing_" + include.replaceAll("/","") + "_Template")){ + LOG.error(MISSING); cxt.getOut().println(MISSING); cxt.setAttribute(MISSING, Boolean.TRUE); _______________________________________________ Kernel-commits mailing list [email protected] http://sesat.no/mailman/listinfo/kernel-commits
