Respect $wgApiFrameOptions in formatted API output mode
authorBrian Wolff <bawolff+wn@gmail.com>
Thu, 23 Oct 2014 01:49:54 +0000 (22:49 -0300)
committerBrian Wolff <bawolff+wn@gmail.com>
Thu, 23 Oct 2014 17:31:31 +0000 (17:31 +0000)
commitd94e6411a5f7a0cb6f3ef2c67a4867dc3828cb7d
tree161bff42018821ffb18ea11c82bc64c37726a6e0
parent3af28efefaa6add1b6a0696812c11280e9948d40
Respect $wgApiFrameOptions in formatted API output mode

This restores the pre- d25cb992 behaviour. Apparently UploadWizard's
flickr module relies on this (Which seems rather wrong, but
regardless I still think api handling of $wgApiFrameOptions should
extend to the "fm" modes.)

Note: If $wgBreakFrames is true, then frames will still be broken.
Although this is a change from prior behaviour, it makes sense
to me that $wgBreakFrames would not allow the human readable output
of the API be frammed.

Bug: 72340
Change-Id: Ia61a4698f7044acfcd7339207590d9333f4100cb
includes/DefaultSettings.php
includes/api/ApiFormatBase.php