MediaWiki 1.16.1-scripts

[autoinstalls/mediawiki.git] / includes / Article.php

diff --git a/includes/Article.php b/includes/Article.php
index d3863c77b30102d8a2eedfdf1b889f225b118d14..5edfc10da2ed988ace7a1064f9814d0972ddf237 100644 (file)
--- 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 = "";