Mercurial > hg > soundsoftware-site
comparison app/controllers/journals_controller.rb @ 1517:dffacf8a6908 redmine-2.5
Update to Redmine SVN revision 13367 on 2.5-stable branch
author | Chris Cannam |
---|---|
date | Tue, 09 Sep 2014 09:29:00 +0100 |
parents | e248c7af89ec |
children |
comparison
equal
deleted
inserted
replaced
1516:b450a9d58aed | 1517:dffacf8a6908 |
---|---|
64 else | 64 else |
65 user = @issue.author | 65 user = @issue.author |
66 text = @issue.description | 66 text = @issue.description |
67 end | 67 end |
68 # Replaces pre blocks with [...] | 68 # Replaces pre blocks with [...] |
69 text = text.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]') | 69 text = text.to_s.strip.gsub(%r{<pre>(.*?)</pre>}m, '[...]') |
70 @content = "#{ll(Setting.default_language, :text_user_wrote, user)}\n> " | 70 @content = "#{ll(Setting.default_language, :text_user_wrote, user)}\n> " |
71 @content << text.gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n" | 71 @content << text.gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n" |
72 rescue ActiveRecord::RecordNotFound | 72 rescue ActiveRecord::RecordNotFound |
73 render_404 | 73 render_404 |
74 end | 74 end |