summaryrefslogtreecommitdiff
path: root/program/steps
diff options
context:
space:
mode:
authorsvncommit <devs@roundcube.net>2006-08-28 15:31:44 +0000
committersvncommit <devs@roundcube.net>2006-08-28 15:31:44 +0000
commit949dea5803fd958d02372870c6b5b8a8ad6f8745 (patch)
tree490443288ab56b9349daea48b68b855d75161e70 /program/steps
parent58afbe954782a65a2a7c666ac4c6b6c69c2b80db (diff)
Fixed tickets 1445501 and 1483820
Diffstat (limited to 'program/steps')
-rw-r--r--program/steps/addressbook/save.inc2
-rw-r--r--program/steps/mail/func.inc2
2 files changed, 2 insertions, 2 deletions
diff --git a/program/steps/addressbook/save.inc b/program/steps/addressbook/save.inc
index 5135e4b04..f6b8b3cc2 100644
--- a/program/steps/addressbook/save.inc
+++ b/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/program/steps/mail/func.inc b/program/steps/mail/func.inc
index a2f2e07c2..8f4f5894c 100644
--- a/program/steps/mail/func.inc
+++ b/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";