| @@ -526,6 +526,7 module ApplicationHelper | |||
|
|
526 | 526 | |
|
|
527 | 527 | def back_url_hidden_field_tag |
|
|
528 | 528 | back_url = params[:back_url] || request.env['HTTP_REFERER'] |
|
|
529 | back_url = CGI.unescape(back_url.to_s) | |
|
|
529 | 530 | hidden_field_tag('back_url', CGI.escape(back_url)) unless back_url.blank? |
|
|
530 | 531 | end |
|
|
531 | 532 | |
| @@ -47,8 +47,8 general_text_Yes: 'Sim' | |||
|
|
47 | 47 | general_text_no: 'não' |
|
|
48 | 48 | general_text_yes: 'sim' |
|
|
49 | 49 | general_lang_name: 'Português(Brasil)' |
|
|
50 |
general_csv_separator: ' |
|
|
|
51 |
general_csv_decimal_separator: ' |
|
|
|
50 | general_csv_separator: ';' | |
|
|
51 | general_csv_decimal_separator: ',' | |
|
|
52 | 52 | general_csv_encoding: ISO-8859-1 |
|
|
53 | 53 | general_pdf_encoding: ISO-8859-1 |
|
|
54 | 54 | general_day_names: Segunda,Terça,Quarta,Quinta,Sexta,Sábado,Domingo |
| @@ -791,7 +791,10 class RedCloth3 < String | |||
|
|
791 | 791 | \s? |
|
|
792 | 792 | (?:\(([^)]+?)\)(?="))? # $title |
|
|
793 | 793 | ": |
|
|
794 |
( |
|
|
|
794 | ( # $url | |
|
|
795 | (\/|https?:\/\/|s?ftps?:\/\/|www\.) | |
|
|
796 | [\w\/]\S+? | |
|
|
797 | ) | |
|
|
795 | 798 | (\/)? # $slash |
|
|
796 | 799 | ([^\w\=\/;\(\)]*?) # $post |
|
|
797 | 800 | (?=<|\s|$) |
| @@ -799,7 +802,7 class RedCloth3 < String | |||
|
|
799 | 802 | #" |
|
|
800 | 803 | def inline_textile_link( text ) |
|
|
801 | 804 | text.gsub!( LINK_RE ) do |m| |
|
|
802 |
pre,atts,text,title,url,slash,post = $~[1.. |
|
|
|
805 | pre,atts,text,title,url,proto,slash,post = $~[1..8] | |
|
|
803 | 806 | |
|
|
804 | 807 | url, url_title = check_refs( url ) |
|
|
805 | 808 | title ||= url_title |
General Comments 0
You need to be logged in to leave comments.
Login now