summaryrefslogtreecommitdiff
path: root/includes/Article.php
diff options
context:
space:
mode:
Diffstat (limited to 'includes/Article.php')
-rw-r--r--includes/Article.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/includes/Article.php b/includes/Article.php
index d3863c77..5edfc10d 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -792,6 +792,9 @@ class Article {
return;
}
+ # Allow frames by default
+ $wgOut->allowClickjacking();
+
# Should the parser cache be used?
$useParserCache = $this->useParserCache( $oldid );
wfDebug( 'Article::view using parser cache: ' . ( $useParserCache ? 'yes' : 'no' ) . "\n" );
@@ -1452,6 +1455,8 @@ class Article {
);
if ( !$dbr->numRows( $tbs ) ) return;
+ $wgOut->preventClickjacking();
+
$tbtext = "";
while ( $o = $dbr->fetchObject( $tbs ) ) {
$rmvtxt = "";