Try to be more subtle for the new line convertions

linuxfrorg · Feb 19, 2011 · 3293800 · 3293800
1 parent f504a0e
commit 3293800
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/import.rb b/import.rb
@@ -16,7 +16,7 @@
 TPL = Sequel.mysql2(cfg['templeet'])
 TPL.run('set names latin1')
 ROR = Sequel.mysql2(cfg['rails'])
-RED = Redis.new
+RED = Redis.new(:host => `hostname`)
 
 $sanitizer = HTML::WhiteListSanitizer.new
 $sanitizer.allowed_tags.merge %w(q u s table tr td th video)

diff --git a/lib/utils.rb b/lib/utils.rb
@@ -81,7 +81,9 @@ def nl2br(txt)
   return '' if txt.nil?
   txt = txt.force_encoding('utf-8')
   begin
-    txt.gsub(/\n/, "<br/>\n").gsub(/(<\/?)acronym/, '\1abbr')
+    tmp = txt.gsub(/(<\/?)acronym/, '\1abbr')
+    return tmp if tmp =~ /<br\s*\/>/
+    tmp.gsub(/\n/, "<br/>\n")
   rescue ArgumentError
     txt = txt.force_encoding("iso-8859-15").encode("utf-8")
     retry