Author: ssthkjer
Date: 2006-11-03 11:56:31 +0100 (Fri, 03 Nov 2006)
New Revision: 3903
Modified:
branches/2.6/war/src/webapp/WEB-INF/jsp/decorators/mainDecorator.jsp
Log:
rollback yahoo!
Modified: branches/2.6/war/src/webapp/WEB-INF/jsp/decorators/mainDecorator.jsp
===================================================================
--- branches/2.6/war/src/webapp/WEB-INF/jsp/decorators/mainDecorator.jsp
2006-11-02 21:53:18 UTC (rev 3902)
+++ branches/2.6/war/src/webapp/WEB-INF/jsp/decorators/mainDecorator.jsp
2006-11-03 10:56:31 UTC (rev 3903)
@@ -289,10 +289,14 @@
<decorator:getProperty property="page.search-results"/>
<%}%>
<% } else if (currentC.equals("p") || currentC.equals("pp") ||
currentC.equals("pip")) {%>
- <div>
+ <div>
<% if ( !"sv".equals(locale) ) { %>
+ <% if (currentC.equals("p")) {%>
+ <decorator:getProperty property="page.picsearch-results"/>
+ <% } else { %>
<search:velocity template="results/scanpix"
command="scanpix"/>
<decorator:getProperty property="page.picsearch-results"/>
+ <%}%>
<% } else { %>
<decorator:getProperty property="page.picsearch-results"/>
<% } %>
_______________________________________________
Kernel-commits mailing list
Kernel-commits@sesat.no
http://sesat.no/mailman/listinfo/kernel-commits
