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 2122f215ff548bfabe7a76ca82d45ce37a50f0c3..8e840b20c27978b66299c889c242760a61de1366 100644 (file)
--- a/debian/patches/default-charset-utf8.patch
+++ b/debian/patches/default-charset-utf8.patch
@@ -1,13 +1,15 @@
 Switch to UTF-8 as default charset
 
---- roundcubemail-0.3.1-dep/config/main.inc.php.dist~  2009-10-21 10:47:40.000000000 +0200
-+++ roundcubemail-0.3.1-dep/config/main.inc.php.dist   2010-07-10 18:06:50.000000000 +0200
-@@ -215,7 +215,7 @@
- $rcmail_config['mdn_requests'] = 0;
+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
+@@ -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';