From e059fa273a2eb363198b876b3002e9c665e128ba Mon Sep 17 00:00:00 2001 From: Mario Stiffel Date: Tue, 28 Feb 2023 10:00:51 +0100 Subject: [PATCH 1/2] (Fix) set cache directory to prevent warnings --- includes/class.backend.php | 2 ++ includes/modify.inc.php | 2 ++ 2 files changed, 4 insertions(+) diff --git a/includes/class.backend.php b/includes/class.backend.php index 5948ac7e8..af935f8fe 100644 --- a/includes/class.backend.php +++ b/includes/class.backend.php @@ -311,6 +311,7 @@ public static function add_comment($task, $comment_text, $time = null) if ($conf['general']['syntax_plugin'] != 'dokuwiki') { $purifierconfig = HTMLPurifier_Config::createDefault(); + $purifierconfig->set('Cache.SerializerPath', 'cache'); $purifierconfig->set('CSS.AllowedProperties', array()); if ($fs->prefs['relnofollow']) { $purifierconfig->set('HTML.Nofollow', true); @@ -1087,6 +1088,7 @@ public static function create_task($args) # dokuwiki syntax plugin filters on output if ($conf['general']['syntax_plugin'] != 'dokuwiki' && isset($sql_args['detailed_desc'])) { $purifierconfig = HTMLPurifier_Config::createDefault(); + $purifierconfig->set('Cache.SerializerPath', 'cache'); $purifierconfig->set('CSS.AllowedProperties', array()); if ($fs->prefs['relnofollow']) { $purifierconfig->set('HTML.Nofollow', true); diff --git a/includes/modify.inc.php b/includes/modify.inc.php index 0b7d37b3c..4265fec33 100644 --- a/includes/modify.inc.php +++ b/includes/modify.inc.php @@ -421,6 +421,7 @@ function resizeImage($file, $max_x, $max_y, $forcePng = false) # dokuwiki syntax plugin filters on output if ($conf['general']['syntax_plugin'] != 'dokuwiki') { $purifierconfig = HTMLPurifier_Config::createDefault(); + $purifierconfig->set('Cache.SerializerPath', 'cache'); $purifierconfig->set('CSS.AllowedProperties', array()); if ($fs->prefs['relnofollow']) { $purifierconfig->set('HTML.Nofollow', true); @@ -2499,6 +2500,7 @@ function resizeImage($file, $max_x, $max_y, $forcePng = false) # dokuwiki syntax plugin filters on output if ($conf['general']['syntax_plugin'] != 'dokuwiki') { $purifierconfig = HTMLPurifier_Config::createDefault(); + $purifierconfig->set('Cache.SerializerPath', 'cache'); $purifierconfig->set('CSS.AllowedProperties', array()); if ($fs->prefs['relnofollow']) { $purifierconfig->set('HTML.Nofollow', true); From 5e13e1b8fcbd14916316c4d5f91935d1a754f346 Mon Sep 17 00:00:00 2001 From: Mario Stiffel Date: Wed, 1 Mar 2023 21:36:01 +0100 Subject: [PATCH 2/2] use FS_CACHE_DIR for HTMLPurifier --- includes/class.backend.php | 4 ++-- includes/modify.inc.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/class.backend.php b/includes/class.backend.php index af935f8fe..ca4b00bd7 100644 --- a/includes/class.backend.php +++ b/includes/class.backend.php @@ -311,7 +311,7 @@ public static function add_comment($task, $comment_text, $time = null) if ($conf['general']['syntax_plugin'] != 'dokuwiki') { $purifierconfig = HTMLPurifier_Config::createDefault(); - $purifierconfig->set('Cache.SerializerPath', 'cache'); + $purifierconfig->set('Cache.SerializerPath', FS_CACHE_DIR); $purifierconfig->set('CSS.AllowedProperties', array()); if ($fs->prefs['relnofollow']) { $purifierconfig->set('HTML.Nofollow', true); @@ -1088,7 +1088,7 @@ public static function create_task($args) # dokuwiki syntax plugin filters on output if ($conf['general']['syntax_plugin'] != 'dokuwiki' && isset($sql_args['detailed_desc'])) { $purifierconfig = HTMLPurifier_Config::createDefault(); - $purifierconfig->set('Cache.SerializerPath', 'cache'); + $purifierconfig->set('Cache.SerializerPath', FS_CACHE_DIR); $purifierconfig->set('CSS.AllowedProperties', array()); if ($fs->prefs['relnofollow']) { $purifierconfig->set('HTML.Nofollow', true); diff --git a/includes/modify.inc.php b/includes/modify.inc.php index 4265fec33..c13e152b4 100644 --- a/includes/modify.inc.php +++ b/includes/modify.inc.php @@ -421,7 +421,7 @@ function resizeImage($file, $max_x, $max_y, $forcePng = false) # dokuwiki syntax plugin filters on output if ($conf['general']['syntax_plugin'] != 'dokuwiki') { $purifierconfig = HTMLPurifier_Config::createDefault(); - $purifierconfig->set('Cache.SerializerPath', 'cache'); + $purifierconfig->set('Cache.SerializerPath', FS_CACHE_DIR); $purifierconfig->set('CSS.AllowedProperties', array()); if ($fs->prefs['relnofollow']) { $purifierconfig->set('HTML.Nofollow', true); @@ -2500,7 +2500,7 @@ function resizeImage($file, $max_x, $max_y, $forcePng = false) # dokuwiki syntax plugin filters on output if ($conf['general']['syntax_plugin'] != 'dokuwiki') { $purifierconfig = HTMLPurifier_Config::createDefault(); - $purifierconfig->set('Cache.SerializerPath', 'cache'); + $purifierconfig->set('Cache.SerializerPath', FS_CACHE_DIR); $purifierconfig->set('CSS.AllowedProperties', array()); if ($fs->prefs['relnofollow']) { $purifierconfig->set('HTML.Nofollow', true);