summaryrefslogtreecommitdiff
path: root/includes/api
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2012-09-02 15:19:34 +0200
committerPierre Schmitz <pierre@archlinux.de>2012-09-02 15:19:34 +0200
commit9498a3d2852ace0f4ee23598f542dbce3fd2ec28 (patch)
tree5aeced25a9fc09f93682788259f5c7d6d248634d /includes/api
parent588cc40aeec0165400421ef9612e81b6d2c7b936 (diff)
Update to MediaWiki 1.19.2
Diffstat (limited to 'includes/api')
-rw-r--r--includes/api/ApiFormatBase.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/includes/api/ApiFormatBase.php b/includes/api/ApiFormatBase.php
index 543c90ce..1eee717a 100644
--- a/includes/api/ApiFormatBase.php
+++ b/includes/api/ApiFormatBase.php
@@ -143,6 +143,12 @@ abstract class ApiFormatBase extends ApiBase {
$this->getMain()->getRequest()->response()->header( "Content-Type: $mime; charset=utf-8" );
+ //Set X-Frame-Options API results (bug 39180)
+ global $wgApiFrameOptions;
+ if ( $wgApiFrameOptions ) {
+ $this->getMain()->getRequest()->response()->header( "X-Frame-Options: $wgApiFrameOptions" );
+ }
+
if ( $isHtml ) {
?>
<!DOCTYPE HTML>