dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "(bug 25830) fix JS preview causing the page to "jump""
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiFormatBase.php
diff --git
a/includes/api/ApiFormatBase.php
b/includes/api/ApiFormatBase.php
index
a8d69f5
..
54c90a6
100644
(file)
--- 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" );
$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>
if ( $isHtml ) {
?>
<!DOCTYPE HTML>