diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-08-02 16:31:15 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-08-02 16:31:15 -0400 |
| commit | 7099c40bcc035e3b96ddd3e976d1cdbcfbf09398 (patch) | |
| tree | 2fbc86f9c4cba01c0a266b7fefdd38b1ec3b5c01 /includes/api/ApiFormatJson.php | |
| parent | a5f917bbc55e295896b8084f6657eb8b6abaf8a8 (diff) | |
| parent | b5e7f46db0fcb6f251206eaf36339ad3ad589f8b (diff) | |
Merge branch 'archwiki' into lukeshu/masterproduction
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 ); } |