eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'gnuio/master' into nightly

Browse Source
This commit is contained in:
Mikael Nordfeldth
2017-12-17 18:32:23 +01:00
parent ec504ec4df 67a9c0415c
commit ec98fd0c43
5 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/util.php
View File

@@ -610,6 +610,10 @@ function common_purify($html, array $args=array())
$cfg->set('URI.Base', $args['URI.Base']); // if null this is like unsetting it I presume
$cfg->set('URI.MakeAbsolute', !is_null($args['URI.Base'])); // if we have a URI base, convert relative URLs to absolute ones.
}
if (common_config('cache', 'dir')) {
$cfg->set('Cache.SerializerPath', common_config('cache', 'dir'));
}
// if you don't want to use the default cache dir for htmlpurifier, set it specifically as $config['htmlpurifier']['Cache.SerializerPath'] = '/tmp'; or something.
foreach (common_config('htmlpurifier') as $key=>$val) {
$cfg->set($key, $val);
}