dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Make a hidden form field to keep the language code"
[lhc/web/wiklou.git]
/
includes
/
Html.php
diff --git
a/includes/Html.php
b/includes/Html.php
index
5f4655c
..
a8dbd61
100644
(file)
--- a/
includes/Html.php
+++ b/
includes/Html.php
@@
-114,7
+114,7
@@
class Html {
* shaved off the HTML output as well.
*
* @param string $element The element's name, e.g., 'a'
* shaved off the HTML output as well.
*
* @param string $element The element's name, e.g., 'a'
- * @param array $attribs
Associative array of attributes, e.g., array(
+ * @param array $attribs Associative array of attributes, e.g., array(
* 'href' => 'http://www.mediawiki.org/' ). See expandAttributes() for
* further documentation.
* @param string $contents The raw HTML contents of the element: *not*
* 'href' => 'http://www.mediawiki.org/' ). See expandAttributes() for
* further documentation.
* @param string $contents The raw HTML contents of the element: *not*
@@
-414,7
+414,7
@@
class Html {
* you can omit the key, e.g., array( 'checked' ) instead of
* array( 'checked' => 'checked' ) or such.
*
* you can omit the key, e.g., array( 'checked' ) instead of
* array( 'checked' => 'checked' ) or such.
*
- * @throws MWException
i
f an attribute that doesn't allow lists is set to an array
+ * @throws MWException
I
f an attribute that doesn't allow lists is set to an array
* @return string HTML fragment that goes between element name and '>'
* (starting with a space if at least one attribute is output)
*/
* @return string HTML fragment that goes between element name and '>'
* (starting with a space if at least one attribute is output)
*/
@@
-502,7
+502,7
@@
class Html {
// Remove duplicates and create the string
$value = implode( ' ', array_unique( $value ) );
// Remove duplicates and create the string
$value = implode( ' ', array_unique( $value ) );
- } else
if ( is_array( $value ) ) {
+ } elseif ( is_array( $value ) ) {
throw new MWException( "HTML attribute $key can not contain a list of values" );
}
throw new MWException( "HTML attribute $key can not contain a list of values" );
}