aboutsummaryrefslogtreecommitdiffstats
path: root/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Config.php
diff options
context:
space:
mode:
authorM. Dent <dentm42@gmail.com>2019-09-23 19:16:38 +0200
committerM. Dent <dentm42@gmail.com>2019-09-23 19:16:38 +0200
commita4f26034545911ff82d73d04517d5e68bf434924 (patch)
treeb5ca62e3ba9726324053418fffc970f5b61d1388 /vendor/ezyang/htmlpurifier/library/HTMLPurifier/Config.php
parentcc860b4a76139f5113b82c4f5bc2923da2f3c828 (diff)
parente37c43ea06deabe86bd0ec572a89e5159b4b6997 (diff)
downloadvolse-hubzilla-a4f26034545911ff82d73d04517d5e68bf434924.tar.gz
volse-hubzilla-a4f26034545911ff82d73d04517d5e68bf434924.tar.bz2
volse-hubzilla-a4f26034545911ff82d73d04517d5e68bf434924.zip
Merge branch 'cherry-pick-a34ce790' into 'dev'
composer update ezyang/htmlpurifier See merge request hubzilla/core!1732
Diffstat (limited to 'vendor/ezyang/htmlpurifier/library/HTMLPurifier/Config.php')
-rw-r--r--vendor/ezyang/htmlpurifier/library/HTMLPurifier/Config.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Config.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Config.php
index f37cf3713..21e8cd768 100644
--- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Config.php
+++ b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Config.php
@@ -21,7 +21,7 @@ class HTMLPurifier_Config
* HTML Purifier's version
* @type string
*/
- public $version = '4.10.0';
+ public $version = '4.11.0';
/**
* Whether or not to automatically finalize
@@ -890,7 +890,7 @@ class HTMLPurifier_Config
// zip(tail(trace), trace) -- but PHP is not Haskell har har
for ($i = 0, $c = count($trace); $i < $c - 1; $i++) {
// XXX this is not correct on some versions of HTML Purifier
- if ($trace[$i + 1]['class'] === 'HTMLPurifier_Config') {
+ if (isset($trace[$i + 1]['class']) && $trace[$i + 1]['class'] === 'HTMLPurifier_Config') {
continue;
}
$frame = $trace[$i];