Author: ghuber
Date: Thu Jun 19 06:55:00 2014
New Revision: 1603725
URL: http://svn.apache.org/r1603725
Log:
Roller must have categories, so empty check not required. See ROL-1789.
Modified:
roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm
Modified: roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm?rev=1603725&r1=1603724&r2=1603725&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm Thu Jun 19
06:55:00 2014
@@ -735,7 +735,7 @@ Show search form for a weblog.
<input type="text" id="q" name="q" size="10" class="text small"
maxlength="255" value="#if($model.term)$model.term#end" />
#if( $showCatChooser )
#set( $cats = $model.weblog.getWeblogCategories())
- #if(!$site && !$cats.empty)
+ #if(!$site)
<select name="cat">
<option value="">- $text.get("mainPage.category") -</option>
#foreach( $cat in $cats )
@@ -765,7 +765,7 @@ Show search form for a weblog.
<input type="search" id="q" name="q" placeholder="Search..."
maxlength="255" value="#if($model.term)$model.term#end" />
#if( $showCatChooser )
#set( $cats = $model.weblog.getWeblogCategories())
- #if(!$site && !$cats.empty)
+ #if(!$site)
<select name="cat">
<option value="">- $text.get("mainPage.category") -</option>
#foreach( $cat in $cats )
@@ -804,7 +804,7 @@ Show search again form for a weblog.
<form method="get" action="$url.search" style="margin: 5px">
<input type="text" id="q" name="q" class="text medium"
maxlength="255" value="$model.term" style="padding-left: 1px" /><br />
#set( $cats = $model.weblog.getWeblogCategories())
- #if(!$site && $model.hits > 0 && !$cats.empty)
+ #if(!$site && $model.hits > 0)
<select name="cat" class="select">
<option value="">$text.get( "macro.searchresults.incategory"
)</option>
#foreach( $cat in $cats )
@@ -827,7 +827,7 @@ Show search again form for a weblog.
<form method="get" action="$url.search" style="margin: 5px">
<input type="search" id="q" name="q" placeholder="Search..."
maxlength="255" value="$model.term" />
#set( $cats = $model.weblog.getWeblogCategories())
- #if(!$site && $model.hits > 0 && !$cats.empty)
+ #if(!$site && $model.hits > 0)
<select name="cat" class="select">
<option value="">$text.get( "macro.searchresults.incategory"
)</option>
#foreach( $cat in $cats )
