diff options
| author | root <root@luna.archlinux.org> | 2016-05-21 06:38:45 +0000 |
|---|---|---|
| committer | root <root@luna.archlinux.org> | 2016-05-21 06:38:45 +0000 |
| commit | b88e92b7f0ce508c55de8c6ac5159ef544d480be (patch) | |
| tree | 86b188507543d2670b7ada1caa8f1139d3d5abe9 /includes/api/ApiFormatPhp.php | |
| parent | a2bbd243c85ea0e425ee3e8c380aba9f254cee61 (diff) | |
| parent | 7bf2eb8ba09b54cec804446ea39a3e658773fac9 (diff) | |
Merge branch 'master' of https://git.archlinux.org/vhosts/wiki.archlinux.org
Diffstat (limited to 'includes/api/ApiFormatPhp.php')
| -rw-r--r-- | includes/api/ApiFormatPhp.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/api/ApiFormatPhp.php b/includes/api/ApiFormatPhp.php index 6420a5b5..643379c7 100644 --- a/includes/api/ApiFormatPhp.php +++ b/includes/api/ApiFormatPhp.php @@ -65,7 +65,7 @@ class ApiFormatPhp extends ApiFormatBase { // just be broken in a useful manner. if ( $this->getConfig()->get( 'MangleFlashPolicy' ) && in_array( 'wfOutputHandler', ob_list_handlers(), true ) && - preg_match( '/\<\s*cross-domain-policy\s*\>/i', $text ) + preg_match( '/\<\s*cross-domain-policy(?=\s|\>)/i', $text ) ) { $this->dieUsage( 'This response cannot be represented using format=php. ' . |