From: Max Semenik Date: Thu, 19 Aug 2010 20:06:54 +0000 (+0000) Subject: Bug 24832: fatal in Special:ComparePages. I've just removed the diffonly URL paramete... X-Git-Tag: 1.31.0-rc.0~35439 X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=ae03d7a03b877c0fdf5135d0c752f14ccff8330c;p=lhc%2Fweb%2Fwiklou.git Bug 24832: fatal in Special:ComparePages. I've just removed the diffonly URL parameter, because: (1) you can't intuitively expect which page should be rendered below a diff of two different pages; (2) diffonly was never available as a UI option, just a hacky GET parameter; (3) it didn't work anyway. This commit reverts most of r68885. --- diff --git a/includes/specials/SpecialComparePages.php b/includes/specials/SpecialComparePages.php index c16333d268..30d2de8ba2 100644 --- a/includes/specials/SpecialComparePages.php +++ b/includes/specials/SpecialComparePages.php @@ -51,7 +51,6 @@ class SpecialComparePages extends SpecialPage { $opts->add( 'rev1', '' ); $opts->add( 'rev2', '' ); $opts->add( 'action', '' ); - $opts->add( 'diffonly', '' ); // Set values $opts->fetchValuesFromRequest( $wgRequest ); @@ -99,13 +98,13 @@ class SpecialComparePages extends SpecialPage { if( $this->opts->getValue( 'rev1' ) && $this->opts->getValue( 'rev2' ) ) { $title = Title::newFromText( $this->opts->getValue( 'page2' ) ); - $de = new DifferenceEngine( $title, + $de = new DifferenceEngine( null, $this->opts->getValue( 'rev1' ), $this->opts->getValue( 'rev2' ), null, // rcid ( $this->opts->getValue( 'action' ) == 'purge' ), false ); - $de->showDiffPage( (bool)$this->opts->getValue( 'diffonly' ) ); + $de->showDiffPage( true ); } }