[svn r20489] logic changes - changed site of directory Serializer - (partial FS#4169)

16 years ago · e1582ec1b8
parent 5f1aef130b
commit e1582ec1b8
3 changed files with 13 additions and 2 deletions
--- a/main/garbage/Serializer/README
+++ b/main/garbage/Serializer/README
@ -0,0 +1,3 @@
+This is a dummy file to prevent Git from ignoring this empty directory.
+
+    vim: et sw=4 sts=4
--- a/main/garbage/Serializer/index.html
+++ b/main/garbage/Serializer/index.html
@ -0,0 +1,6 @@
+<html>
+<head>
+</head>
+<body>
+</body>
+</html>
--- a/main/inc/lib/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer.php
+++ b/main/inc/lib/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer.php
@ -88,8 +88,9 @@ class HTMLPurifier_DefinitionCache_Serializer extends
     * @todo Make protected
     */
    public function generateBaseDirectoryPath($config) {
-        $base = $config->get('Cache', 'SerializerPath');
-        $base = is_null($base) ? HTMLPURIFIER_PREFIX . '/HTMLPurifier/DefinitionCache/Serializer' : $base;
+        $base = $config->get('Cache', 'SerializerPath');//main/garbage/Serializer
+       // $base = is_null($base) ? HTMLPURIFIER_PREFIX . '/HTMLPurifier/DefinitionCache/Serializer' : $base;
+        $base = is_null($base) ? '../../main/garbage/Serializer' : $base;       
        return $base;
    }

@ -158,6 +159,7 @@ class HTMLPurifier_DefinitionCache_Serializer extends
            trigger_error('Directory '.$dir.' not writable, '.
                'please chmod to ' . $chmod,
                E_USER_WARNING);
+               // chmod($dir,0777);
        } else {
            // generic error message
            trigger_error('Directory '.$dir.' not writable, '.