Merge commit 'upstream/0.7'

[roundcube.git] / debian / patches / correct-magic-path.patch

diff --git a/debian/patches/correct-magic-path.patch b/debian/patches/correct-magic-path.patch
index e2ca99fa8e487826ab1a94c92956a8fad8504033..db7e4bef83a59753680de413c1e93e1d0c7f28f0 100644 (file)
--- a/debian/patches/correct-magic-path.patch
+++ b/debian/patches/correct-magic-path.patch
@@ -4,12 +4,12 @@ Index: b/config/main.inc.php.dist
 ===================================================================
 --- a/config/main.inc.php.dist 2009-10-21 10:47:40.000000000 +0200
 +++ b/config/main.inc.php.dist 2010-07-17 17:33:23.000000000 +0200
-@@ -338,7 +338,7 @@
- $rcmail_config['max_pagesize'] = 200;
+@@ -301,7 +301,7 @@
+ $rcmail_config['identities_level'] = 0;
  
  // mime magic database
 -$rcmail_config['mime_magic'] = '/usr/share/misc/magic';
 +$rcmail_config['mime_magic'] = '/usr/share/file/magic';
  
- // default sort col
- $rcmail_config['message_sort_col'] = 'date';
+ // Enable DNS checking for e-mail address validation
+ $rcmail_config['email_dns_check'] = false;