diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-05-04 09:46:27 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-05-04 09:46:27 +0200 |
| commit | be4c9a9598350fb4333480f0c7b302acebcddfd4 (patch) | |
| tree | fb0c2606ad4ca0bc1a710d6fdf82f55c326b3427 /vendor/ezyang/htmlpurifier/maintenance | |
| parent | f15c12376adad6534c8c0ea547a7548697eb8379 (diff) | |
| parent | be852ba857f4cb8e75574a762945b50c8bddcff9 (diff) | |
| download | volse-hubzilla-be4c9a9598350fb4333480f0c7b302acebcddfd4.tar.gz volse-hubzilla-be4c9a9598350fb4333480f0c7b302acebcddfd4.tar.bz2 volse-hubzilla-be4c9a9598350fb4333480f0c7b302acebcddfd4.zip | |
Merge branch '3.4RC'3.4
Diffstat (limited to 'vendor/ezyang/htmlpurifier/maintenance')
| -rw-r--r-- | vendor/ezyang/htmlpurifier/maintenance/PH5P.php | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | vendor/ezyang/htmlpurifier/maintenance/compile-doxygen.sh | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | vendor/ezyang/htmlpurifier/maintenance/flush-definition-cache.php | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | vendor/ezyang/htmlpurifier/maintenance/generate-entity-file.php | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | vendor/ezyang/htmlpurifier/maintenance/generate-standalone.php | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | vendor/ezyang/htmlpurifier/maintenance/merge-library.php | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | vendor/ezyang/htmlpurifier/maintenance/regenerate-docs.sh | 0 |
7 files changed, 2 insertions, 2 deletions
diff --git a/vendor/ezyang/htmlpurifier/maintenance/PH5P.php b/vendor/ezyang/htmlpurifier/maintenance/PH5P.php index 9d83dcbf5..a04273e01 100644 --- a/vendor/ezyang/htmlpurifier/maintenance/PH5P.php +++ b/vendor/ezyang/htmlpurifier/maintenance/PH5P.php @@ -1080,7 +1080,7 @@ class HTML5 $entity = $this->character($start, $this->char); $cond = strlen($e_name) > 0; - // The rest of the parsing happens bellow. + // The rest of the parsing happens below. break; // Anything else @@ -1102,7 +1102,7 @@ class HTML5 } $cond = isset($entity); - // The rest of the parsing happens bellow. + // The rest of the parsing happens below. break; } diff --git a/vendor/ezyang/htmlpurifier/maintenance/compile-doxygen.sh b/vendor/ezyang/htmlpurifier/maintenance/compile-doxygen.sh index ecd1127fd..ecd1127fd 100755..100644 --- a/vendor/ezyang/htmlpurifier/maintenance/compile-doxygen.sh +++ b/vendor/ezyang/htmlpurifier/maintenance/compile-doxygen.sh diff --git a/vendor/ezyang/htmlpurifier/maintenance/flush-definition-cache.php b/vendor/ezyang/htmlpurifier/maintenance/flush-definition-cache.php index 138badb65..138badb65 100755..100644 --- a/vendor/ezyang/htmlpurifier/maintenance/flush-definition-cache.php +++ b/vendor/ezyang/htmlpurifier/maintenance/flush-definition-cache.php diff --git a/vendor/ezyang/htmlpurifier/maintenance/generate-entity-file.php b/vendor/ezyang/htmlpurifier/maintenance/generate-entity-file.php index ff1713e39..ff1713e39 100755..100644 --- a/vendor/ezyang/htmlpurifier/maintenance/generate-entity-file.php +++ b/vendor/ezyang/htmlpurifier/maintenance/generate-entity-file.php diff --git a/vendor/ezyang/htmlpurifier/maintenance/generate-standalone.php b/vendor/ezyang/htmlpurifier/maintenance/generate-standalone.php index 254d4d83b..254d4d83b 100755..100644 --- a/vendor/ezyang/htmlpurifier/maintenance/generate-standalone.php +++ b/vendor/ezyang/htmlpurifier/maintenance/generate-standalone.php diff --git a/vendor/ezyang/htmlpurifier/maintenance/merge-library.php b/vendor/ezyang/htmlpurifier/maintenance/merge-library.php index de2eecdc0..de2eecdc0 100755..100644 --- a/vendor/ezyang/htmlpurifier/maintenance/merge-library.php +++ b/vendor/ezyang/htmlpurifier/maintenance/merge-library.php diff --git a/vendor/ezyang/htmlpurifier/maintenance/regenerate-docs.sh b/vendor/ezyang/htmlpurifier/maintenance/regenerate-docs.sh index 6f4d720ff..6f4d720ff 100755..100644 --- a/vendor/ezyang/htmlpurifier/maintenance/regenerate-docs.sh +++ b/vendor/ezyang/htmlpurifier/maintenance/regenerate-docs.sh |