diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2016-05-21 08:33:14 +0200 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2016-05-21 08:33:14 +0200 |
| commit | 7bf2eb8ba09b54cec804446ea39a3e658773fac9 (patch) | |
| tree | 12fa50d1d49fe0c7f9b5cff08aa88d93f5d4146f /includes/api/ApiFormatJson.php | |
| parent | c96958a50a97382ef4ada897d1e7120d7a222a28 (diff) | |
Update to MediaWiki 1.26.3
Diffstat (limited to 'includes/api/ApiFormatJson.php')
| -rw-r--r-- | includes/api/ApiFormatJson.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/api/ApiFormatJson.php b/includes/api/ApiFormatJson.php index be1b12c3..baba5b2d 100644 --- a/includes/api/ApiFormatJson.php +++ b/includes/api/ApiFormatJson.php @@ -102,9 +102,9 @@ class ApiFormatJson extends ApiFormatBase { // Bug 66776: wfMangleFlashPolicy() is needed to avoid a nasty bug in // Flash, but what it does isn't friendly for the API, so we need to // work around it. - if ( preg_match( '/\<\s*cross-domain-policy\s*\>/i', $json ) ) { + if ( preg_match( '/\<\s*cross-domain-policy(?=\s|\>)/i', $json ) ) { $json = preg_replace( - '/\<(\s*cross-domain-policy\s*)\>/i', '\\u003C$1\\u003E', $json + '/\<(\s*cross-domain-policy(?=\s|\>))/i', '\\u003C$1', $json ); } |