Fixed tickets 1445501 and 1483820

3 files changed, 8 insertions, 2 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 29c425c55..422fb1762 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 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";