Index: app/controllers/issues_controller.rb
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- app/controllers/issues_controller.rb	(revision 36750f3)
+++ app/controllers/issues_controller.rb	(revision 9e4783319f98513aca1736ca5dd758e9f8ea0800)
@@ -99,7 +99,8 @@
   end
 
   def show
-    @journals = @issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on ASC")
+    @journals = @issue.journals.includes([:user, :details]).order("`journals`.`created_on` ASC") if User.current.allowed_to?(:view_private_messages, @issue.project)
+    @journals = @issue.journals.includes([:user, :details]).order("`journals`.`created_on` ASC").where("`journals`.`private` IS NULL") unless User.current.allowed_to?(:view_private_messages, @issue.project)
     @journals.each_with_index {|j,i| j.indice = i+1}
     @journals.reverse! if User.current.wants_comments_in_reverse_order?
 
Index: lib/redmine/export/pdf.rb
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- lib/redmine/export/pdf.rb	(revision 36750f3)
+++ lib/redmine/export/pdf.rb	(revision 9e4783319f98513aca1736ca5dd758e9f8ea0800)
@@ -646,9 +646,10 @@
         pdf.RDMCell(190,5, l(:label_history), "B")
         pdf.Ln
         indice = 0
-        for journal in issue.journals.find(
-                          :all, :include => [:user, :details],
-                          :order => "#{Journal.table_name}.created_on ASC")
+
+        journals = issue.journals.includes([:user, :details]).order("`journals`.`created_on` ASC") if User.current.allowed_to?(:view_private_messages, @issue.project)
+        journals = issue.journals.includes([:user, :details]).order("`journals`.`created_on` ASC").where("`journals`.`private` IS NULL") unless User.current.allowed_to?(:view_private_messages, @issue.project)
+        journals.each do |journal|
           indice = indice + 1
           pdf.SetFontStyle('B',8)
           pdf.RDMCell(190,5,