diff options
author | Klaus Weidenbach <Klaus.Weidenbach@gmx.net> | 2018-03-18 02:13:05 +0100 |
---|---|---|
committer | Klaus Weidenbach <Klaus.Weidenbach@gmx.net> | 2018-03-18 02:15:29 +0100 |
commit | c80837a9e6a1d5049a03fbb608b2b650c1b0f92d (patch) | |
tree | 360fb2685c74cdac0e714a44c813dbc8efe92028 /vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache | |
parent | 0009f7f05133a74bbe3206a5b4d0223ba9dea4bc (diff) | |
download | volse-hubzilla-c80837a9e6a1d5049a03fbb608b2b650c1b0f92d.tar.gz volse-hubzilla-c80837a9e6a1d5049a03fbb608b2b650c1b0f92d.tar.bz2 volse-hubzilla-c80837a9e6a1d5049a03fbb608b2b650c1b0f92d.zip |
:arrow_up: Update libraries.
michelf/php-markdown (1.7.0 => 1.8.0)
ezyang/htmlpurifier (v4.9.3 => v4.10.0)
commerceguys/intl (v0.7.4 => v0.7.5)
sabre/http (4.2.3 => v4.2.4)
sabre/vobject (4.1.3 => 4.1.5)
Diffstat (limited to 'vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache')
-rw-r--r-- | vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer.php | 13 | ||||
-rw-r--r--[-rwxr-xr-x] | vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer/README | 0 |
2 files changed, 9 insertions, 4 deletions
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer.php index 952e48d47..b82c6bb20 100644 --- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer.php +++ b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer.php @@ -217,9 +217,14 @@ class HTMLPurifier_DefinitionCache_Serializer extends HTMLPurifier_DefinitionCac $directory = $this->generateDirectoryPath($config); $chmod = $config->get('Cache.SerializerPermissions'); if ($chmod === null) { - // TODO: This races - if (is_dir($directory)) return true; - return mkdir($directory); + if (!@mkdir($directory) && !is_dir($directory)) { + trigger_error( + 'Could not create directory ' . $directory . '', + E_USER_WARNING + ); + return false; + } + return true; } if (!is_dir($directory)) { $base = $this->generateBaseDirectoryPath($config); @@ -233,7 +238,7 @@ class HTMLPurifier_DefinitionCache_Serializer extends HTMLPurifier_DefinitionCac } elseif (!$this->_testPermissions($base, $chmod)) { return false; } - if (!mkdir($directory, $chmod)) { + if (!@mkdir($directory, $chmod) && !is_dir($directory)) { trigger_error( 'Could not create directory ' . $directory . '', E_USER_WARNING diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer/README b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer/README index 2e35c1c3d..2e35c1c3d 100755..100644 --- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer/README +++ b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer/README |