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
Replace infobox usages and extend successbox, warningbox and errorbox
[lhc/web/wiklou.git]
/
includes
/
Xml.php
diff --git
a/includes/Xml.php
b/includes/Xml.php
index
d1a56bf
..
b368a13
100644
(file)
--- a/
includes/Xml.php
+++ b/
includes/Xml.php
@@
-47,12
+47,10
@@
class Xml {
}
if ( is_null( $contents ) ) {
$out .= '>';
}
if ( is_null( $contents ) ) {
$out .= '>';
+ } elseif ( $allowShortTag && $contents === '' ) {
+ $out .= ' />';
} else {
} else {
- if ( $allowShortTag && $contents === '' ) {
- $out .= ' />';
- } else {
- $out .= '>' . htmlspecialchars( $contents, ENT_NOQUOTES ) . "</$element>";
- }
+ $out .= '>' . htmlspecialchars( $contents, ENT_NOQUOTES ) . "</$element>";
}
return $out;
}
}
return $out;
}
@@
-268,7
+266,7
@@
class Xml {
/**
* Convenience function to build an HTML text input field
* @param string $name Value of the name attribute
/**
* Convenience function to build an HTML text input field
* @param string $name Value of the name attribute
- * @param int $size Value of the size attribute
+ * @param int
|false
$size Value of the size attribute
* @param mixed $value Value of the value attribute
* @param array $attribs Other attributes
* @return string HTML
* @param mixed $value Value of the value attribute
* @param array $attribs Other attributes
* @return string HTML
@@
-291,7
+289,7
@@
class Xml {
/**
* Convenience function to build an HTML password input field
* @param string $name Value of the name attribute
/**
* Convenience function to build an HTML password input field
* @param string $name Value of the name attribute
- * @param int $size Value of the size attribute
+ * @param int
|false
$size Value of the size attribute
* @param mixed $value Value of the value attribute
* @param array $attribs Other attributes
* @return string HTML
* @param mixed $value Value of the value attribute
* @param array $attribs Other attributes
* @return string HTML
@@
-602,7
+600,7
@@
class Xml {
*
* @param string|bool $legend Legend of the fieldset. If evaluates to false,
* legend is not added.
*
* @param string|bool $legend Legend of the fieldset. If evaluates to false,
* legend is not added.
- * @param string $content Pre-escaped content for the fieldset. If false,
+ * @param string
|false
$content Pre-escaped content for the fieldset. If false,
* only open fieldset is returned.
* @param array $attribs Any attributes to fieldset-element.
*
* only open fieldset is returned.
* @param array $attribs Any attributes to fieldset-element.
*