diff options
| author | friendica <info@friendica.com> | 2015-01-01 22:33:28 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-01 22:33:28 -0800 |
| commit | 82d0a4af452015e870bdcea56f1008ea22d066b3 (patch) | |
| tree | 3ad1db1aeb0dfdeb10a70b99da353fe3094f1d69 /library/HTMLPurifier/HTMLModule/Proprietary.php | |
| parent | 9a34e18319301e0a952f674899aeb58b424637a4 (diff) | |
| parent | 68c612c597471404201099ecbc8b4082d152e18a (diff) | |
| download | volse-hubzilla-82d0a4af452015e870bdcea56f1008ea22d066b3.tar.gz volse-hubzilla-82d0a4af452015e870bdcea56f1008ea22d066b3.tar.bz2 volse-hubzilla-82d0a4af452015e870bdcea56f1008ea22d066b3.zip | |
Merge branch 'master' into trinidad
Diffstat (limited to 'library/HTMLPurifier/HTMLModule/Proprietary.php')
| -rw-r--r-- | library/HTMLPurifier/HTMLModule/Proprietary.php | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/library/HTMLPurifier/HTMLModule/Proprietary.php b/library/HTMLPurifier/HTMLModule/Proprietary.php index dd36a3de0..5ee3c8e67 100644 --- a/library/HTMLPurifier/HTMLModule/Proprietary.php +++ b/library/HTMLPurifier/HTMLModule/Proprietary.php @@ -6,12 +6,21 @@ */ class HTMLPurifier_HTMLModule_Proprietary extends HTMLPurifier_HTMLModule { - + /** + * @type string + */ public $name = 'Proprietary'; - public function setup($config) { - - $this->addElement('marquee', 'Inline', 'Flow', 'Common', + /** + * @param HTMLPurifier_Config $config + */ + public function setup($config) + { + $this->addElement( + 'marquee', + 'Inline', + 'Flow', + 'Common', array( 'direction' => 'Enum#left,right,up,down', 'behavior' => 'Enum#alternate', @@ -25,9 +34,7 @@ class HTMLPurifier_HTMLModule_Proprietary extends HTMLPurifier_HTMLModule 'vspace' => 'Pixels', ) ); - } - } // vim: et sw=4 sts=4 |