From 942cbb658180e8260441225dd74457ef9503a6d0 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Tue, 8 Jan 2013 12:13:44 +0100 Subject: [PATCH 1/3] Don't convert to link a text with < and > characters --- program/lib/Roundcube/rcube_string_replacer.php | 2 +- tests/Framework/StringReplacer.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/program/lib/Roundcube/rcube_string_replacer.php b/program/lib/Roundcube/rcube_string_replacer.php index 6b289886b..49a378166 100644 --- a/program/lib/Roundcube/rcube_string_replacer.php +++ b/program/lib/Roundcube/rcube_string_replacer.php @@ -34,7 +34,7 @@ class rcube_string_replacer { // Simplified domain expression for UTF8 characters handling // Support unicode/punycode in top-level domain part - $utf_domain = '[^?&@"\'\\/()\s\r\t\n]+\\.?([^\\x00-\\x2f\\x3b-\\x40\\x5b-\\x60\\x7b-\\x7f]{2,}|xn--[a-zA-Z0-9]{2,})'; + $utf_domain = '[^?&@"\'\\/()<>\s\r\t\n]+\\.?([^\\x00-\\x2f\\x3b-\\x40\\x5b-\\x60\\x7b-\\x7f]{2,}|xn--[a-zA-Z0-9]{2,})'; $url1 = '.:;,'; $url2 = 'a-zA-Z0-9%=#$@+?!&\\/_~\\[\\]\\(\\){}\*-'; diff --git a/tests/Framework/StringReplacer.php b/tests/Framework/StringReplacer.php index 60399cf6b..e630ebac0 100644 --- a/tests/Framework/StringReplacer.php +++ b/tests/Framework/StringReplacer.php @@ -35,6 +35,8 @@ class Framework_StringReplacer extends PHPUnit_Framework_TestCase array('(http://link.com)', '(http://link.com)'), array('http://link.com?a(b)c', 'http://link.com?a(b)c'), array('http://link.com?(link)', 'http://link.com?(link)'), + array('http://', 'http://'), + array('http://', 'http://'), ); } From fd88a22eff5c62c5f0c0063132f862dadbcb2eaa Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Wed, 9 Jan 2013 08:48:28 +0100 Subject: [PATCH 2/3] Force autocommit mode in mysql database driver (#1488902) --- CHANGELOG | 4 ++++ program/lib/Roundcube/rcube_db_mysql.php | 3 +++ 2 files changed, 7 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index fc50d97df..d031f7306 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,10 @@ CHANGELOG Roundcube Webmail =========================== +- Force autocommit mode in mysql database driver (#1488902) + +RELEASE 0.9-beta +---------------- - Fix searching by date in address book (#1488888) - Improve charset detection by prioritizing charset according to user language (#1485669) - Fix handling of escaped separator in vCard file (#1488896) diff --git a/program/lib/Roundcube/rcube_db_mysql.php b/program/lib/Roundcube/rcube_db_mysql.php index c32cc259c..8ab6403c8 100644 --- a/program/lib/Roundcube/rcube_db_mysql.php +++ b/program/lib/Roundcube/rcube_db_mysql.php @@ -126,6 +126,9 @@ class rcube_db_mysql extends rcube_db // Always return matching (not affected only) rows count $result[PDO::MYSQL_ATTR_FOUND_ROWS] = true; + // Enable AUTOCOMMIT mode (#1488902) + $dsn_options[PDO::ATTR_AUTOCOMMIT] = true; + return $result; } From 941fa518369b2640488b1bd6d4067b954e0520ce Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Wed, 9 Jan 2013 08:49:01 +0100 Subject: [PATCH 3/3] Add 0.9-beta to list of releases --- installer/rcube_install.php | 1 + 1 file changed, 1 insertion(+) diff --git a/installer/rcube_install.php b/installer/rcube_install.php index 530be3ebe..6ef105bc7 100644 --- a/installer/rcube_install.php +++ b/installer/rcube_install.php @@ -452,6 +452,7 @@ class rcube_install '0.6-beta', '0.6', '0.7-beta', '0.7', '0.7.1', '0.7.2', '0.7.3', '0.8-beta', '0.8-rc', '0.8.0', '0.8.1', '0.8.2', '0.8.3', '0.8.4', + '0.9-beta', )); return $select; }