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/ApiFormatPhp.php | |
| parent | a5f917bbc55e295896b8084f6657eb8b6abaf8a8 (diff) | |
| parent | b5e7f46db0fcb6f251206eaf36339ad3ad589f8b (diff) | |
Merge branch 'archwiki' into lukeshu/masterHEADproductionmaster
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. ' . |