move HTMLPurifier cache inside CACHE_DIR/htmlpurifier

diff --git a/.gitignore b/.gitignore
index 4c76f15e363b8653241c13a98103503c21eb05ed..148d206a8a9888e9805591ceaa7b63b46d098338 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@ icons/*
 cache/*/*
 lock/*
 tags
+cache/htmlpurifier/*/*ser
 lib/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer/*/*ser

diff --git a/cache/htmlpurifier/.empty b/cache/htmlpurifier/.empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/functions.php b/functions.php
index 0a2345ff6b699315c319231cbc3e4eeac6882b8d..4abca26c069345f24164fdd390137aead2f06004 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -120,6 +120,7 @@
        @$config->set('HTML', 'Allowed', $allowed);
        $config->set('Output.FlashCompat', true);
        $config->set('Attr.EnableID', true);
+       $config->set('Cache', 'SerializerPath', CACHE_DIR . "/htmlpurifier");
 
        $purifier = new HTMLPurifier($config);
 

diff --git a/sanity_check.php b/sanity_check.php
index e518a8c269a1514d5a8c543b76025bbe111e49de..ce755f4028b2fe9e0237e067c25496f4b4ecb382 100644 (file)
--- a/sanity_check.php
+++ b/sanity_check.php
@@ -17,7 +17,7 @@
                $err_msg = "config: your config file version is incorrect. See config.php-dist.\n";
        }
 
-       $purifier_cache_dir = "lib/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer";
+       $purifier_cache_dir = CACHE_DIR . "/htmlpurifier";
 
        if (!is_writable($purifier_cache_dir)) {
                $err_msg = "config: HTMLPurifier cache directory should be writable by anyone (chmod -R 777 $purifier_cache_dir)";