diff lib/redmine/helpers/diff.rb @ 909:cbb26bc654de redmine-1.3

Update to Redmine 1.3-stable branch (Redmine SVN rev 8964)

--- a/lib/redmine/helpers/diff.rb	Fri Feb 24 18:36:29 2012 +0000
+++ b/lib/redmine/helpers/diff.rb	Fri Feb 24 19:09:32 2012 +0000
@@ -5,12 +5,12 @@
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
@@ -22,15 +22,15 @@
       include ActionView::Helpers::TagHelper
       include ActionView::Helpers::TextHelper
       attr_reader :diff, :words
-      
+
       def initialize(content_to, content_from)
         @words = content_to.to_s.split(/(\s+)/)
         @words = @words.select {|word| word != ' '}
         words_from = content_from.to_s.split(/(\s+)/)
-        words_from = words_from.select {|word| word != ' '}    
+        words_from = words_from.select {|word| word != ' '}
         @diff = words_from.diff @words
       end
-  
+
       def to_html
         words = self.words.collect{|word| h(word)}
         words_add = 0
@@ -41,7 +41,7 @@
           add_at = nil
           add_to = nil
           del_at = nil
-          deleted = ""      
+          deleted = ""
           diff.each do |change|
             pos = change[1]
             if change[0] == "+"
@@ -65,7 +65,7 @@
             words_del = 0
           end
         end
-        words.join(' ')
+        words.join(' ').html_safe
       end
     end
   end