diff options
| author | estadtherr <estadtherr@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2006-08-28 15:31:44 +0000 |
|---|---|---|
| committer | estadtherr <estadtherr@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2006-08-28 15:31:44 +0000 |
| commit | 1d042c3a6b1ddecbf9e26d08db2d544fdcd09473 (patch) | |
| tree | 283b4e6471b080bb1f6c58fa0a1fb09447547ba3 /roundcubemail/program | |
| parent | 7e1b026f4ace01f90b2b3483cc31d0270daf4126 (diff) | |
Fixed tickets 1445501 and 1483820
git-svn-id: https://svn.roundcube.net/trunk@327 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program')
| -rw-r--r-- | roundcubemail/program/steps/addressbook/save.inc | 2 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/func.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/roundcubemail/program/steps/addressbook/save.inc b/roundcubemail/program/steps/addressbook/save.inc index 5135e4b04..f6b8b3cc2 100644 --- a/roundcubemail/program/steps/addressbook/save.inc +++ b/roundcubemail/program/steps/addressbook/save.inc @@ -151,7 +151,7 @@ else foreach ($emails as $email) { $DB->query("INSERT INTO $contacts_table - (user_id, name, email + (user_id, name, email) VALUES ({$_SESSION['user_id']}," . $DB->quote($names[$n++]) . "," . $DB->quote($email) . ")"); $insert_id[] = $DB->insert_id(); diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc index a2f2e07c2..8f4f5894c 100644 --- a/roundcubemail/program/steps/mail/func.inc +++ b/roundcubemail/program/steps/mail/func.inc @@ -718,7 +718,7 @@ function rcmail_print_body($part, $safe=FALSE, $plain=FALSE) // make links and email-addresses clickable $convert_patterns = $convert_replaces = $replace_strings = array(); - $url_chars = 'a-z0-9_\-\+\*\$\/&%=@#:'; + $url_chars = 'a-z0-9_\-\+\*\$\/&%=@#:;'; $url_chars_within = '\?\.~,!'; $convert_patterns[] = "/([\w]+):\/\/([a-z0-9\-\.]+[a-z]{2,4}([$url_chars$url_chars_within]*[$url_chars])?)/ie"; |