Author: ssmiweve
Date: 2009-09-24 12:49:28 +0200 (Thu, 24 Sep 2009)
New Revision: 7287
Modified:
branches/2.18/war/src/main/java/no/sesat/search/view/taglib/SearchTabMainTag.java
Log:
use the correct findLayout when PageContext is available. pushes $layout into
the context.
Modified:
branches/2.18/war/src/main/java/no/sesat/search/view/taglib/SearchTabMainTag.java
===================================================================
---
branches/2.18/war/src/main/java/no/sesat/search/view/taglib/SearchTabMainTag.java
2009-09-23 15:37:55 UTC (rev 7286)
+++
branches/2.18/war/src/main/java/no/sesat/search/view/taglib/SearchTabMainTag.java
2009-09-24 10:49:28 UTC (rev 7287)
@@ -1,4 +1,4 @@
-/* Copyright (2006-2008) Schibsted ASA
+/* Copyright (2006-2009) Schibsted ASA
* This file is part of SESAT.
*
* SESAT is free software: you can redistribute it and/or modify
@@ -84,7 +84,7 @@
final PageContext cxt = (PageContext) getJspContext();
final DataModel datamodel = (DataModel)
cxt.findAttribute(DataModel.KEY);
- final Layout layout = findLayout(datamodel);
+ final Layout layout = findLayout(cxt);
final String front = (layout!=null && layout.getFront()!=null &&
layout.getFront().length()>0)?layout.getFront():null;
final String main = (layout!=null && layout.getMain()!=null &&
layout.getMain().length()>0)?layout.getMain():null;
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
