From 8f93926e1bc6e96fc11b4d0d201025022d471de7 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Tue, 4 Jan 2011 12:24:29 +0100
Subject: update to MediaWiki 1.16.1

---
 includes/Article.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'includes/Article.php')

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 = "";
-- 
cgit v1.2.3-54-g00ecf