diff options
author | Andrew Manning <tamanning@zoho.com> | 2018-03-27 21:11:34 -0400 |
---|---|---|
committer | Andrew Manning <tamanning@zoho.com> | 2018-03-27 21:11:34 -0400 |
commit | 1dc795722a8e748ebb98e8fab778cd4686a0654f (patch) | |
tree | 4f4a4e8dea10090106c4d54a02c6860332cd9df4 /vendor/ezyang/htmlpurifier/maintenance | |
parent | dcd658f12ea60945678717e3c310e94ece7b1f96 (diff) | |
parent | c98776923a3aed4a0a17ca1412787de3b718eba9 (diff) | |
download | volse-hubzilla-1dc795722a8e748ebb98e8fab778cd4686a0654f.tar.gz volse-hubzilla-1dc795722a8e748ebb98e8fab778cd4686a0654f.tar.bz2 volse-hubzilla-1dc795722a8e748ebb98e8fab778cd4686a0654f.zip |
Merge branch 'dev' into oauth2
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 |