Author: ssanjamt
Date: 2008-02-05 10:54:46 +0100 (Tue, 05 Feb 2008)
New Revision: 6084
Modified:
branches/2.16/war/src/main/java/no/sesat/search/view/taglib/AbstractVelocityTemplateTag.java
Log:
SEARCH-4198 Logo click causes 404 errors
Modified:
branches/2.16/war/src/main/java/no/sesat/search/view/taglib/AbstractVelocityTemplateTag.java
===================================================================
---
branches/2.16/war/src/main/java/no/sesat/search/view/taglib/AbstractVelocityTemplateTag.java
2008-02-05 09:51:44 UTC (rev 6083)
+++
branches/2.16/war/src/main/java/no/sesat/search/view/taglib/AbstractVelocityTemplateTag.java
2008-02-05 09:54:46 UTC (rev 6084)
@@ -90,7 +90,7 @@
if(null != cxt && null != datamodel && null != datamodel.getPage()){
final SearchTab tab = datamodel.getPage().getCurrentTab();
final StringDataObject layoutDO =
datamodel.getParameters().getValue(RunningQueryImpl.PARAM_LAYOUT);
- layout = null != cxt.getAttribute("layout") ?
(Layout)cxt.getAttribute("layout") : null != layoutDO
+ layout = null != cxt.getAttribute("layout") ?
(Layout)cxt.getAttribute("layout") : null != layoutDO && null != tab && null !=
tab.getLayouts()
? tab.getLayouts().get(layoutDO.getXmlEscaped())
: tab.getDefaultLayout();
cxt.setAttribute("layout", layout);
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
