From 16915ee2ad97060e0c0c9376adf7eca77516cd86 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Tue, 8 Jan 2013 12:13:44 +0100 Subject: Don't convert to link a text with < and > characters --- program/lib/Roundcube/rcube_string_replacer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'program') 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%=#$@+?!&\\/_~\\[\\]\\(\\){}\*-'; -- cgit v1.2.3 From f96593772ce3d685f7add2c3357428b82a5a6c84 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Wed, 9 Jan 2013 08:48:28 +0100 Subject: Force autocommit mode in mysql database driver (#1488902) --- CHANGELOG | 4 ++++ program/lib/Roundcube/rcube_db_mysql.php | 3 +++ 2 files changed, 7 insertions(+) (limited to 'program') diff --git a/CHANGELOG b/CHANGELOG index fe98dd00f..25d79d1e2 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; } -- cgit v1.2.3 From c0a714348478f42b0a803afa4586e7389827f72d Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Wed, 9 Jan 2013 15:09:00 +0100 Subject: Reset $db_error_msg on query --- program/lib/Roundcube/rcube_db.php | 1 + 1 file changed, 1 insertion(+) (limited to 'program') diff --git a/program/lib/Roundcube/rcube_db.php b/program/lib/Roundcube/rcube_db.php index 3e4617948..086a38ab4 100644 --- a/program/lib/Roundcube/rcube_db.php +++ b/program/lib/Roundcube/rcube_db.php @@ -402,6 +402,7 @@ class rcube_db // destroy reference to previous result, required for SQLite driver (#1488874) $this->last_result = null; + $this->db_error_msg = null; // send query $query = $this->dbh->query($query); -- cgit v1.2.3