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 "Enforce no-session constraint in opensearch_desc.php and profileinfo.php"
[lhc/web/wiklou.git]
/
includes
/
parser
/
Sanitizer.php
diff --git
a/includes/parser/Sanitizer.php
b/includes/parser/Sanitizer.php
index
d885e24
..
85c71ee
100644
(file)
--- a/
includes/parser/Sanitizer.php
+++ b/
includes/parser/Sanitizer.php
@@
-1508,10
+1508,10
@@
class Sanitizer {
* @return string
*/
private static function normalizeWhitespace( $text ) {
- return preg_replace(
- '/
\r\n|[\x20\x0d\x0a\x09]
/',
+ return
trim(
preg_replace(
+ '/
(?:\r\n|[\x20\x0d\x0a\x09])+
/',
' ',
- $text );
+ $text )
)
;
}
/**