From a7c51ac2d032e29e9599a6f64849c24eb1f7f94d Mon Sep 17 00:00:00 2001 From: alecpl Date: Mon, 12 Sep 2011 06:44:56 +0000 Subject: - Applied fixes from trunk up to r5202 --- program/include/rcube_string_replacer.php | 2 +- program/js/app.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'program') diff --git a/program/include/rcube_string_replacer.php b/program/include/rcube_string_replacer.php index 5ce986fcb..5d743bfff 100644 --- a/program/include/rcube_string_replacer.php +++ b/program/include/rcube_string_replacer.php @@ -37,7 +37,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-\\x40\\x5b-\\x60\\x7b-\\x7f]{2,}|xn--[a-z0-9]{2,})'; + $utf_domain = '[^?&@"\'\\/()\s\r\t\n]+\\.([^\\x00-\\x2f\\x3b-\\x40\\x5b-\\x60\\x7b-\\x7f]{2,}|xn--[a-z0-9]{2,})'; $url1 = '.:;,'; $url2 = 'a-z0-9%=#@+?&\\/_~\\[\\]-'; diff --git a/program/js/app.js b/program/js/app.js index 062eee2da..bc16b8607 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -320,7 +320,6 @@ function rcube_webmail() } if (this.gui_objects.qsearchbox) { this.enable_command('search', 'reset-search', 'moveto', true); - $(this.gui_objects.qsearchbox).select(); } if (this.contact_list && this.contact_list.rowcount > 0) -- cgit v1.2.3