From 9c01d83951a7463df08efa856ebd25662cde22cb Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Sat, 7 May 2011 05:51:39 +0000 Subject: [PATCH] remove trailing white-spaces from attachments helper. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5681 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/attachments_helper.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/helpers/attachments_helper.rb b/app/helpers/attachments_helper.rb index 367976515..e6150a3b3 100644 --- a/app/helpers/attachments_helper.rb +++ b/app/helpers/attachments_helper.rb @@ -1,16 +1,16 @@ -# redMine - project management software -# Copyright (C) 2006-2007 Jean-Philippe Lang +# Redmine - project management software +# Copyright (C) 2006-2011 Jean-Philippe Lang # # This program is free software; you can redistribute it and/or # 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. @@ -21,13 +21,13 @@ module AttachmentsHelper # :author -- author names are not displayed if set to false def link_to_attachments(container, options = {}) options.assert_valid_keys(:author) - + if container.attachments.any? options = {:deletable => container.attachments_deletable?, :author => true}.merge(options) render :partial => 'attachments/links', :locals => {:attachments => container.attachments, :options => options} end end - + def to_utf8(str) if str.respond_to?(:force_encoding) str.force_encoding('UTF-8') @@ -35,7 +35,7 @@ module AttachmentsHelper else return str if /\A[\r\n\t\x20-\x7e]*\Z/n.match(str) # for us-ascii end - + begin Iconv.conv('UTF-8//IGNORE', 'UTF-8', str + ' ')[0..-3] rescue Iconv::InvalidEncoding -- 2.39.5