diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2011-01-04 12:24:29 +0100 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2011-01-04 12:24:29 +0100 |
commit | 8f93926e1bc6e96fc11b4d0d201025022d471de7 (patch) | |
tree | 7e13841de0a7d33faf5481d44ca7471ce639193a /includes/Article.php | |
parent | fe786bf329367b2d2663ea7f2474ceaeeace6180 (diff) |
update to MediaWiki 1.16.1
Diffstat (limited to 'includes/Article.php')
-rw-r--r-- | includes/Article.php | 5 |
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 = ""; |