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 "Use IDatabase as return type for BotPassword::getDB"
[lhc/web/wiklou.git]
/
includes
/
Html.php
diff --git
a/includes/Html.php
b/includes/Html.php
index
0aea7ea
..
fdc348b
100644
(file)
--- a/
includes/Html.php
+++ b/
includes/Html.php
@@
-213,7
+213,7
@@
class Html {
// Silly XML.
return substr( $start, 0, -1 ) . '/>';
} else {
// Silly XML.
return substr( $start, 0, -1 ) . '/>';
} else {
- return
"$start$contents"
. self::closeElement( $element );
+ return
$start . $contents
. self::closeElement( $element );
}
}
}
}
@@
-518,7
+518,7
@@
class Html {
$newValue = [];
foreach ( $value as $k => $v ) {
if ( is_string( $v ) ) {
$newValue = [];
foreach ( $value as $k => $v ) {
if ( is_string( $v ) ) {
- // String values should be normal `
array( 'foo' )
`
+ // String values should be normal `
[ 'foo' ]
`
// Just append them
if ( !isset( $value[$v] ) ) {
// As a special case don't set 'foo' if a
// Just append them
if ( !isset( $value[$v] ) ) {
// As a special case don't set 'foo' if a
@@
-574,10
+574,8
@@
class Html {
$attrs = [];
if ( $nonce !== null ) {
$attrs['nonce'] = $nonce;
$attrs = [];
if ( $nonce !== null ) {
$attrs['nonce'] = $nonce;
- } else {
- if ( ContentSecurityPolicy::isNonceRequired( RequestContext::getMain()->getConfig() ) ) {
- wfWarn( "no nonce set on script. CSP will break it" );
- }
+ } elseif ( ContentSecurityPolicy::isNonceRequired( RequestContext::getMain()->getConfig() ) ) {
+ wfWarn( "no nonce set on script. CSP will break it" );
}
if ( preg_match( '/<\/?script/i', $contents ) ) {
}
if ( preg_match( '/<\/?script/i', $contents ) ) {
@@
-600,10
+598,8
@@
class Html {
$attrs = [ 'src' => $url ];
if ( $nonce !== null ) {
$attrs['nonce'] = $nonce;
$attrs = [ 'src' => $url ];
if ( $nonce !== null ) {
$attrs['nonce'] = $nonce;
- } else {
- if ( ContentSecurityPolicy::isNonceRequired( RequestContext::getMain()->getConfig() ) ) {
- wfWarn( "no nonce set on script. CSP will break it" );
- }
+ } elseif ( ContentSecurityPolicy::isNonceRequired( RequestContext::getMain()->getConfig() ) ) {
+ wfWarn( "no nonce set on script. CSP will break it" );
}
return self::element( 'script', $attrs );
}
return self::element( 'script', $attrs );
@@
-973,7
+969,7
@@
class Html {
if ( $isXHTML ) { // XHTML5
// XML MIME-typed markup should have an xml header.
// However a DOCTYPE is not needed.
if ( $isXHTML ) { // XHTML5
// XML MIME-typed markup should have an xml header.
// However a DOCTYPE is not needed.
- $ret .= "<?xml version=\"1.0\" encoding=\"UTF-8\" ?
" . "
>\n";
+ $ret .= "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n";
// Add the standard xmlns
$attribs['xmlns'] = 'http://www.w3.org/1999/xhtml';
// Add the standard xmlns
$attribs['xmlns'] = 'http://www.w3.org/1999/xhtml';
@@
-983,7
+979,6
@@
class Html {
$attribs["xmlns:$tag"] = $ns;
}
} else { // HTML5
$attribs["xmlns:$tag"] = $ns;
}
} else { // HTML5
- // DOCTYPE
$ret .= "<!DOCTYPE html>\n";
}
$ret .= "<!DOCTYPE html>\n";
}