diff options
| author | Max Kostikov <max@kostikov.co> | 2019-11-08 23:39:04 +0100 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2019-11-08 23:39:04 +0100 |
| commit | ec68ede79faffd5733c3eaa24df2e4fb3b54eeb9 (patch) | |
| tree | c26098c1c0ebff705dc4ef4f324b8b1656c61b9a /vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule.php | |
| parent | 3706afbd01164c9f322c605d6ec242e6ca4770fa (diff) | |
| parent | 478014f02a9241ec6d5b5e9672968897176302d2 (diff) | |
| download | volse-hubzilla-ec68ede79faffd5733c3eaa24df2e4fb3b54eeb9.tar.gz volse-hubzilla-ec68ede79faffd5733c3eaa24df2e4fb3b54eeb9.tar.bz2 volse-hubzilla-ec68ede79faffd5733c3eaa24df2e4fb3b54eeb9.zip | |
Merge branch 'dev' into 'dev'
Dev sync
See merge request kostikov/core!4
Diffstat (limited to 'vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule.php')
| -rw-r--r-- | vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule.php b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule.php index bb3a9230b..6d898f80c 100644 --- a/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule.php +++ b/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule.php @@ -132,9 +132,9 @@ class HTMLPurifier_HTMLModule * @param string $element Name of element to add * @param string|bool $type What content set should element be registered to? * Set as false to skip this step. - * @param string $contents Allowed children in form of: + * @param string|HTMLPurifier_ChildDef $contents Allowed children in form of: * "$content_model_type: $content_model" - * @param array $attr_includes What attribute collections to register to + * @param array|string $attr_includes What attribute collections to register to * element? * @param array $attr What unique attributes does the element define? * @see HTMLPurifier_ElementDef:: for in-depth descriptions of these parameters. |