jro_apps/redmine Commit - r1202:a92cce385105

Textile formatting:...

Jean-Philippe Lang -

r1202:a92cce385105

parent child

Context file:

r1202:a92cce385105

lib/redcloth.rb +11 -4

                     @pre_list = []
                     rip_offtags text
                     no_textile text
+                    escape_html_tags text
                     hard_break text
                     unless @lite_mode
                         refs text
                     re =
                         case rtype
                         when :limit
-                            /(\W)
+                            /(^|[>\s])
                             (#{rcq})
                             (#{C})
                             (?::(\S+?))?
-                            (\S.*?\S|\S)
+                            ([^\s\-].*?[^\s\-]|\w)
                             #{rcq}
-                            (?=\W)/x
+                            (?=[[:punct:]]|\s|$)/x
                         else
                             /(#{rcq})
                             (#{C})
                             (?::(\S+))?
-                            (\S.*?\S|\S)
+                            ([^\s\-].*?[^\s\-]|\w)
                             #{rcq}/xm
                         end
                     [rc, ht, re, rtype]
                         end
                     end
                 end
+                ALLOWED_TAGS = %w(redpre pre)
+                def escape_html_tags(text)
+                  text.gsub!(%r{<((\/?)(\w+))}) {|m| ALLOWED_TAGS.include?($3) ? "<#{$1}" : "&lt;#{$1}" }
+                end
             end

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages