summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authormkinski <miko.kinski@yahoo.de>2012-08-08 19:24:59 (GMT)
committermkinski <miko.kinski@yahoo.de>2012-08-08 19:24:59 (GMT)
commit794d0b35fb6b552b76fe536155e8dacaf8328d6c (patch)
tree4e9ac4bbd42f9491bb48f2b5c669e8ddedfd7e54 /app
parentc6a409255bdeb3fab96c9538238a8d06bcc8efb2 (diff)
downloadwiki_external_filter-794d0b35fb6b552b76fe536155e8dacaf8328d6c.zip
wiki_external_filter-794d0b35fb6b552b76fe536155e8dacaf8328d6c.tar.gz
wiki_external_filter-794d0b35fb6b552b76fe536155e8dacaf8328d6c.tar.bz2
joining splitted args to avoid redmine core changes
Diffstat (limited to 'app')
-rw-r--r--app/helpers/wiki_external_filter_helper.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/app/helpers/wiki_external_filter_helper.rb b/app/helpers/wiki_external_filter_helper.rb
index a96d60a..efe5c9b 100644
--- a/app/helpers/wiki_external_filter_helper.rb
+++ b/app/helpers/wiki_external_filter_helper.rb
@@ -80,9 +80,13 @@ module WikiExternalFilterHelper
def build_forced(text, attachments, info)
+ # joining splitted args
+ # not necessary from v2.1.0
+ text = text.join(", ")
+
if info['replace_attachments'] and attachments
attachments.each do |att|
- text.to_s.gsub!(/#{att.filename.downcase}/i, att.diskfile)
+ text.gsub!(/#{att.filename.downcase}/i, att.diskfile)
end
end
@@ -90,7 +94,7 @@ module WikiExternalFilterHelper
content = []
errors = ""
- text = text.first.to_s.gsub("<br />", "\n")
+ text = text.gsub("<br />", "\n")
Rails.logger.debug "\n Text #{text} \n"
info['outputs'].each do |out|