Merge branch 'master' into mmn_fixes

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

diff --git a/lib/default.php b/lib/default.php
index b945c24e207596b0a756400cd7df3bf5baec1ea0..0fa8ce167850dc811ccbcd6e1d58b90a6ce1930d 100644 (file)
--- a/lib/default.php
+++ b/lib/default.php
@@ -241,6 +241,7 @@ $default =
                                 'application/vnd.oasis.opendocument.text-web'               => 'oth',
                                 'application/pdf'   => 'pdf',
                                 'application/zip'   => 'zip',
+                                'application/x-go-sgf' => 'sgf',
                                 'application/xml'   => 'xml',
                                 'image/png'         => 'png',
                                 'image/jpeg'        => 'jpg',
@@ -295,11 +296,15 @@ $default =
         array('handle' => false,   // whether to handle sessions ourselves
               'debug' => false,    // debugging output for sessions
               'gc_limit' => 1000), // max sessions to expire at a time
-        'htmlfilter' => array(  // purify HTML through HTMLPurifier
+        'htmlfilter' => [  // remove tags from user/remotely generated HTML if they are === true
             'img' => true,
             'video' => true,
             'audio' => true,
-        ),
+        ],
+        'htmlpurifier' => [ // configurable options for HTMLPurifier
+            'Cache.DefinitionImpl'  => 'Serializer',
+            'Cache.SerializerPath'  => implode(DIRECTORY_SEPARATOR, [sys_get_temp_dir(), 'gnusocial']),
+        ],
         'notice' =>
         array('contentlimit' => null,
               'allowprivate' => false,  // whether to allow users to "check the padlock" to publish notices available for their subscribers.