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/diff | |
| parent | fe786bf329367b2d2663ea7f2474ceaeeace6180 (diff) | |
update to MediaWiki 1.16.1
Diffstat (limited to 'includes/diff')
| -rw-r--r-- | includes/diff/DifferenceInterface.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/includes/diff/DifferenceInterface.php b/includes/diff/DifferenceInterface.php index d7d36799..0e9ca9f6 100644 --- 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 = ''; |