diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb
index 434ea4470..22881b8f2 100644
--- a/app/controllers/boards_controller.rb
+++ b/app/controllers/boards_controller.rb
@@ -103,7 +103,7 @@ class BoardsController < ApplicationController
@topic_pages = Paginator.new @topic_count, per_page_option, params['page']
#现在发布帖子的时候置顶功能已经没有了。所以取消这个置顶排序 #{Message.table_name}.sticky DESC,
@topics = @board.topics.
- reorder("#{Message.table_name}.created_on desc").
+ reorder("#{Message.table_name}.sticky DESC, #{Message.table_name}.created_on desc").
includes(:last_reply).
limit(@topic_pages.per_page).
offset(@topic_pages.offset).
diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index 4f022261f..3cfd4ae72 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -51,9 +51,9 @@
:data => {:confirm => l(:text_are_you_sure)},
:class => 'talk_edit fr',
:style => ' margin-right: 10px;') if topic.destroyable_by?(User.current) %>
- <%# if topic.sticky? %>
-
- <%# end %>
+ <% if topic.sticky? %>
+ <%= l(:label_board_sticky)%>
+ <% end %>