From 949dea5803fd958d02372870c6b5b8a8ad6f8745 Mon Sep 17 00:00:00 2001
From: svncommit <devs@roundcube.net>
Date: Mon, 28 Aug 2006 11:31:44 -0400
Subject: [PATCH] Fixed tickets 1445501 and 1483820
---
CHANGELOG | 6 ++++++
program/steps/addressbook/save.inc | 2 +-
program/steps/mail/func.inc | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 29c425c..422fb17 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,12 @@
CHANGELOG RoundCube Webmail
---------------------------
+2006/08/28 (estadtherr)
+----------
+- Fixed URL character set (Ticket #1445501)
+- Fixed saving of contact into MySQL from LDAP query results (Ticket #1483820)
+
+
2006/08/25 (thomasb)
----------
- Fixed folder renaming: unsubscribe before rename (Bug #1483920)
diff --git a/program/steps/addressbook/save.inc b/program/steps/addressbook/save.inc
index 5135e4b..f6b8b3c 100644
--- a/program/steps/addressbook/save.inc
+++ b/program/steps/addressbook/save.inc
@@ -151,7 +151,7 @@
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 a2f2e07..8f4f589 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -718,7 +718,7 @@
// 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";
--
Gitblit v1.9.1