MediaWiki 1.16.5

[autoinstalls/mediawiki.git] / includes / diff / DifferenceInterface.php

diff --git a/includes/diff/DifferenceInterface.php b/includes/diff/DifferenceInterface.php
index d7d36799b658199162b33709a4af81062754e684..0e9ca9f6d80b5d3c2e5cc016aac8018ebd316be2 100644 (file)
--- a/includes/diff/DifferenceInterface.php
+++ b/includes/diff/DifferenceInterface.php
@@ -112,6 +112,8 @@ class DifferenceEngine {
                global $wgUser, $wgOut, $wgUseExternalEditor, $wgUseRCPatrol;
                wfProfileIn( __METHOD__ );
 
+               # Allow frames except in certain special cases
+               $wgOut->allowClickjacking();
 
                # If external diffs are enabled both globally and for the user,
                # we'll use the application/x-external-editor interface to call
@@ -199,6 +201,7 @@ CONTROL;
                // Check if page is editable
                $editable = $this->mNewRev->getTitle()->userCan( 'edit' );
                if ( $editable && $this->mNewRev->isCurrent() && $wgUser->isAllowed( 'rollback' ) ) {
+                       $wgOut->preventClickjacking();
                        $rollback = '   ' . $sk->generateRollback( $this->mNewRev );
                } else {
                        $rollback = '';