Merge commit 'upstream/0.7'

[roundcube.git] / debian / patches / default-charset-utf8.patch

diff --git a/debian/patches/default-charset-utf8.patch b/debian/patches/default-charset-utf8.patch
index 24c3ea5a244a208badd732bd2f605d76d5db9b50..8e840b20c27978b66299c889c242760a61de1366 100644 (file)
--- a/debian/patches/default-charset-utf8.patch
+++ b/debian/patches/default-charset-utf8.patch
@@ -4,12 +4,12 @@ Index: b/config/main.inc.php.dist
 ===================================================================
 --- a/config/main.inc.php.dist 2010-07-17 17:33:24.000000000 +0200
 +++ b/config/main.inc.php.dist 2010-07-17 17:33:25.000000000 +0200
-@@ -215,7 +215,7 @@
- $rcmail_config['mdn_requests'] = 0;
+@@ -489,7 +489,7 @@
+ // ----------------------------------
  
  // Use this charset as fallback for message decoding
 -$rcmail_config['default_charset'] = 'ISO-8859-1';
 +$rcmail_config['default_charset'] = 'UTF-8';
  
- // Make use of the built-in spell checker. It is based on GoogieSpell.
- // Since Google only accepts connections over https your PHP installatation
+ // skin name: folder from skins/
+ $rcmail_config['skin'] = 'default';