Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / lib / default.php

diff --git a/lib/default.php b/lib/default.php
index 7894dbb6745e4027be32f9351119f171fce0cce2..65293a8c934342d0de76023da1b7a8993745506e 100644 (file)
--- a/lib/default.php
+++ b/lib/default.php
@@ -133,18 +133,13 @@ $default =
               'delete' => false,
               'move' => true),
         'image' =>
-        array('jpegquality' => 85),
+        array('jpegquality' => 95),
         'avatar' =>
         array('server' => null,
               'dir' => INSTALLDIR . '/avatar/',
               'path' => $_path . '/avatar/',
               'ssl' => null,
               'maxsize' => 300),
-        'background' =>
-        array('server' => null,
-              'dir' => INSTALLDIR . '/background/',
-              'path' => $_path . '/background/',
-              'ssl' => null),
         'public' =>
         array('localonly' => false,
               'blacklist' => array(),
@@ -215,6 +210,7 @@ $default =
         array('server' => null,
               'dir' => INSTALLDIR . '/file/',
               'path' => $_path . '/file/',
+              'chmod' => 0644,        // Access rights (chmod) for any attachments
               'sslserver' => null,
               'sslpath' => null,
               'ssl' => null,