jro_apps/redmine Commit - r10023:3673fbd881c0

Fixed: Can't use non-latin anchor in wiki (#11577)....

Jean-Philippe Lang -

r10023:3673fbd881c0

parent child

Context file:

r10023:3673fbd881c0

app/helpers/application_helper.rb +6 -1

               end
               def sanitize_anchor_name(anchor)
-                anchor.gsub(%r{[^\w\s\-]}, '').gsub(%r{\s+(\-+\s*)?}, '-')
+                if ''.respond_to?(:encoding)
+                  anchor.gsub(%r{[^\p{Word}\s\-]}, '').gsub(%r{\s+(\-+\s*)?}, '-')
+                else
+                  # TODO: remove when ruby1.8 is no longer supported
+                  anchor.gsub(%r{[^\w\s\-]}, '').gsub(%r{\s+(\-+\s*)?}, '-')
+                end
               end
               # Returns the javascript tags that are included in the html layout head

test/unit/helpers/application_helper_test.rb +4 0

+            # encoding: utf-8
+            #
             # Redmine - project management software
             # Copyright (C) 2006-2012  Jean-Philippe Lang
             #
                   # link with anchor
                   '[[CookBook documentation#One-section]]' => '<a href="/projects/ecookbook/wiki/CookBook_documentation#One-section" class="wiki-page">CookBook documentation</a>',
                   '[[Another page#anchor|Page]]' => '<a href="/projects/ecookbook/wiki/Another_page#anchor" class="wiki-page">Page</a>',
+                  # UTF8 anchor
+                  '[[Another_page#Тест|Тест]]' => %|<a href="/projects/ecookbook/wiki/Another_page##{CGI.escape 'Тест'}" class="wiki-page">Тест</a>|,
                   # page that doesn't exist
                   '[[Unknown page]]' => '<a href="/projects/ecookbook/wiki/Unknown_page" class="wiki-page new">Unknown page</a>',
                   '[[Unknown page|404]]' => '<a href="/projects/ecookbook/wiki/Unknown_page" class="wiki-page new">404</a>',

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