fix for 標題後台為「校園新聞」，前台顯示為「新聞」 該頁面為列表，最上方卻出現「搜尋結果」？ from Mr.張

vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb

@@ -15,9 +15,9 @@
 	<th><%= t('announcement.bulletin.title') %></th>
 	<th><%= t('announcement.bulletin.postdate') %></th>
   </tr>
-    <% if @bulletins.blank? %>
+    <% if @bulletins.blank? and !params[:search_query].blank? %>
       <%=render :partial => 'shared/search_not_found'  %>
-      <% else %>
+      <% elsif  !params[:search_query].blank?  %>
         <%= t("search.result_get",:item_num=>@bulletins.count) %>
      <% end %>
 <% @bulletins.each do |post| %>

vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb

@@ -7,9 +7,9 @@
 <% else %>
 	<h1 class="h1"><%= t('news.news') %></h1>
 <% end %>
-	   <% if @news_bulletins.blank? %>
+	   <% if @news_bulletins.blank? and !params[:search_query].blank? %>
 	   	<%=render :partial => 'shared/search_not_found'  %>
-	   <% else %>
+	   <% elsif  !params[:search_query].blank?  %>
         	<%= t("search.result_get",:item_num=>@news_bulletins.count) %>
 	   <% end %>
 <table class="table table-bordered">