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 "Fix wfLocalFile() replacement"
[lhc/web/wiklou.git]
/
includes
/
Xml.php
diff --git
a/includes/Xml.php
b/includes/Xml.php
index
9744aee
..
febf03e
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;
}
@@
-454,7
+452,7
@@
class Xml {
/**
* Convenience function to build an HTML submit button
* When $wgUseMediaWikiUIEverywhere is true it will default to a progressive button
/**
* Convenience function to build an HTML submit button
* When $wgUseMediaWikiUIEverywhere is true it will default to a progressive button
- * @param string $value Label text for the button
+ * @param string $value Label text for the button
(unescaped)
* @param array $attribs Optional custom attributes
* @return string HTML
*/
* @param array $attribs Optional custom attributes
* @return string HTML
*/