diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2014-09-29 20:17:39 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2014-09-29 20:17:39 +0200 |
| commit | 6c1ae996157551dcf5bb4e7e8922677bb3d3d358 (patch) | |
| tree | b3a4162367176a4e2ebadbd6ab31753c1b042be0 /inc/form.php | |
| parent | 35f3340eb3b989194a496861abfb5b3d3c9a630d (diff) | |
| parent | 57271d078b9c433bec79d75cb44dadcafeae07df (diff) | |
| download | rpg-6c1ae996157551dcf5bb4e7e8922677bb3d3d358.tar.gz rpg-6c1ae996157551dcf5bb4e7e8922677bb3d3d358.tar.bz2 | |
Merge branch 'master' into stable
* master: (214 commits)
release preparations
postgresql auth plugin: correct function name
parse AT parameter: first strtotime then timestamp remove config option
move more strings to lang.php
move strings to lang.php
add placeholders for create page text
phpdocs parserutils
improve some scrutinizer issues
visibility plugin methods
use config cascade for loading of localizations
reformatting config cascade
add lang files to cascading
work around missing gzopen on certain systems #865
translation update
fix scrutinizer issues
fixed typos in docblock comments
do not allow empty passwords
clean user credentials from control chars
added filter method to INPUT class
translation update
...
Diffstat (limited to 'inc/form.php')
| -rw-r--r-- | inc/form.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/inc/form.php b/inc/form.php index 9cd0491e0..fadc71d3e 100644 --- a/inc/form.php +++ b/inc/form.php @@ -131,7 +131,7 @@ class Doku_Form { * The element can be either a pseudo-tag or string. * If string, it is printed without escaping special chars. * * - * @param string $elem Pseudo-tag or string to add to the form. + * @param string|array $elem Pseudo-tag or string to add to the form. * @author Tom N Harris <tnharris@whoopdedo.org> */ function addElement($elem) { @@ -143,8 +143,8 @@ class Doku_Form { * * Inserts a content element at a position. * - * @param string $pos 0-based index where the element will be inserted. - * @param string $elem Pseudo-tag or string to add to the form. + * @param string $pos 0-based index where the element will be inserted. + * @param string|array $elem Pseudo-tag or string to add to the form. * @author Tom N Harris <tnharris@whoopdedo.org> */ function insertElement($pos, $elem) { @@ -156,8 +156,8 @@ class Doku_Form { * * Replace with NULL to remove an element. * - * @param int $pos 0-based index the element will be placed at. - * @param string $elem Pseudo-tag or string to add to the form. + * @param int $pos 0-based index the element will be placed at. + * @param string|array $elem Pseudo-tag or string to add to the form. * @author Tom N Harris <tnharris@whoopdedo.org> */ function replaceElement($pos, $elem) { |