Merged r2212 to r2214 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.8-stable@2215 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
56318aab53
commit
6abd32be9e
@ -526,6 +526,7 @@ module ApplicationHelper
|
||||
|
||||
def back_url_hidden_field_tag
|
||||
back_url = params[:back_url] || request.env['HTTP_REFERER']
|
||||
back_url = CGI.unescape(back_url.to_s)
|
||||
hidden_field_tag('back_url', CGI.escape(back_url)) unless back_url.blank?
|
||||
end
|
||||
|
||||
|
@ -47,8 +47,8 @@ general_text_Yes: 'Sim'
|
||||
general_text_no: 'não'
|
||||
general_text_yes: 'sim'
|
||||
general_lang_name: 'Português(Brasil)'
|
||||
general_csv_separator: ','
|
||||
general_csv_decimal_separator: '.'
|
||||
general_csv_separator: ';'
|
||||
general_csv_decimal_separator: ','
|
||||
general_csv_encoding: ISO-8859-1
|
||||
general_pdf_encoding: ISO-8859-1
|
||||
general_day_names: Segunda,Terça,Quarta,Quinta,Sexta,Sábado,Domingo
|
||||
|
@ -791,7 +791,10 @@ class RedCloth3 < String
|
||||
\s?
|
||||
(?:\(([^)]+?)\)(?="))? # $title
|
||||
":
|
||||
([\w\/]\S+?) # $url
|
||||
( # $url
|
||||
(\/|https?:\/\/|s?ftps?:\/\/|www\.)
|
||||
[\w\/]\S+?
|
||||
)
|
||||
(\/)? # $slash
|
||||
([^\w\=\/;\(\)]*?) # $post
|
||||
(?=<|\s|$)
|
||||
@ -799,7 +802,7 @@ class RedCloth3 < String
|
||||
#"
|
||||
def inline_textile_link( text )
|
||||
text.gsub!( LINK_RE ) do |m|
|
||||
pre,atts,text,title,url,slash,post = $~[1..7]
|
||||
pre,atts,text,title,url,proto,slash,post = $~[1..8]
|
||||
|
||||
url, url_title = check_refs( url )
|
||||
title ||= url_title
|
||||
|
Loading…
x
Reference in New Issue
Block a user