Revert r19877; no reason is given for it but it breaks things such as parameter subst...

[lhc/web/wiklou.git] / includes / DifferenceEngine.php

diff --git a/includes/DifferenceEngine.php b/includes/DifferenceEngine.php
index 4563e6b..e6218b6 100644 (file)
--- a/includes/DifferenceEngine.php
+++ b/includes/DifferenceEngine.php
@@ -1,15 +1,13 @@
 <?php
 /**
  * See diff.doc
- * @package MediaWiki
- * @subpackage DifferenceEngine
+ * @addtogroup DifferenceEngine
  */
 
 /**
  * @todo document
  * @public
- * @package MediaWiki
- * @subpackage DifferenceEngine
+ * @addtogroup DifferenceEngine
  */
 class DifferenceEngine {
        /**#@+
@@ -64,7 +62,7 @@ class DifferenceEngine {
        }
 
        function showDiffPage( $diffOnly = false ) {
-               global $wgUser, $wgOut, $wgContLang, $wgUseExternalEditor, $wgUseRCPatrol;
+               global $wgUser, $wgOut, $wgUseExternalEditor, $wgUseRCPatrol;
                $fname = 'DifferenceEngine::showDiffPage';
                wfProfileIn( $fname );
 
@@ -179,11 +177,11 @@ CONTROL;
 
                $oldHeader = "<strong>{$this->mOldtitle}</strong><br />" .
                        $sk->revUserTools( $this->mOldRev ) . "<br />" .
-                       $oldminor . $sk->revComment( $this->mOldRev, true ) . "<br />" .
+                       $oldminor . $sk->revComment( $this->mOldRev, !$diffOnly ) . "<br />" .
                        $prevlink;
                $newHeader = "<strong>{$this->mNewtitle}</strong><br />" .
                        $sk->revUserTools( $this->mNewRev ) . " $rollback<br />" .
-                       $newminor . $sk->revComment( $this->mNewRev, true ) . "<br />" .
+                       $newminor . $sk->revComment( $this->mNewRev, !$diffOnly ) . "<br />" .
                        $nextlink . $patrol;
 
                $this->showDiff( $oldHeader, $newHeader );
@@ -203,6 +201,10 @@ CONTROL;
                wfProfileIn( $fname );
 
                $wgOut->addHTML( "<hr /><h2>{$this->mPagetitle}</h2>\n" );
+               #add deleted rev tag if needed
+               if ( !$this->mNewRev->userCan(Revision::DELETED_TEXT) ) {
+                       $wgOut->addWikiText( wfMsg( 'rev-deleted-text-permission' ) );
+               }
 
                if( !$this->mNewRev->isCurrent() ) {
                        $oldEditSectionSetting = $wgOut->parserOptions()->setEditSection( false );
@@ -213,7 +215,7 @@ CONTROL;
                        $wgOut->setRevisionId( $this->mNewRev->getId() );
                }
 
-               $wgOut->addSecondaryWikiText( $this->mNewtext );
+               $wgOut->addWikiTextTidy( $this->mNewtext );
 
                if( !$this->mNewRev->isCurrent() ) {
                        $wgOut->parserOptions()->setEditSection( $oldEditSectionSetting );
@@ -330,9 +332,14 @@ CONTROL;
                        }
                }
 
+               #loadtext is permission safe, this just clears out the diff
                if ( !$this->loadText() ) {
                        wfProfileOut( $fname );
                        return false;
+               } else if ( $this->mOldRev && !$this->mOldRev->userCan(Revision::DELETED_TEXT) ) {
+                 return '';
+               } else if ( $this->mNewRev && !$this->mNewRev->userCan(Revision::DELETED_TEXT) ) {
+                 return '';
                }
 
                $difftext = $this->generateDiffBody( $this->mOldtext, $this->mNewtext );
@@ -471,6 +478,14 @@ CONTROL;
         * Add the header to a diff body
         */
        function addHeader( $diff, $otitle, $ntitle, $multi = '' ) {
+               global $wgOut;
+       
+               if ( $this->mOldRev && $this->mOldRev->isDeleted(Revision::DELETED_TEXT) ) {
+                  $otitle = '<span class="history-deleted">'.$otitle.'</span>';
+               }
+               if ( $this->mNewRev && $this->mNewRev->isDeleted(Revision::DELETED_TEXT) ) {
+                  $ntitle = '<span class="history-deleted">'.$ntitle.'</span>';
+               }
                $header = "
                        <table border='0' width='98%' cellpadding='0' cellspacing='4' class='diff'>
                        <tr>
@@ -597,13 +612,13 @@ CONTROL;
                }
                if ( $this->mOldRev ) {
                        // FIXME: permission tests
-                       $this->mOldtext = $this->mOldRev->getText();
+                       $this->mOldtext = $this->mOldRev->revText();
                        if ( $this->mOldtext === false ) {
                                return false;
                        }
                }
                if ( $this->mNewRev ) {
-                       $this->mNewtext = $this->mNewRev->getText();
+                       $this->mNewtext = $this->mNewRev->revText();
                        if ( $this->mNewtext === false ) {
                                return false;
                        }
@@ -641,8 +656,7 @@ define('USE_ASSERTS', function_exists('assert'));
 /**
  * @todo document
  * @private
- * @package MediaWiki
- * @subpackage DifferenceEngine
+ * @addtogroup DifferenceEngine
  */
 class _DiffOp {
        var $type;
@@ -665,8 +679,7 @@ class _DiffOp {
 /**
  * @todo document
  * @private
- * @package MediaWiki
- * @subpackage DifferenceEngine
+ * @addtogroup DifferenceEngine
  */
 class _DiffOp_Copy extends _DiffOp {
        var $type = 'copy';
@@ -686,8 +699,7 @@ class _DiffOp_Copy extends _DiffOp {
 /**
  * @todo document
  * @private
- * @package MediaWiki
- * @subpackage DifferenceEngine
+ * @addtogroup DifferenceEngine
  */
 class _DiffOp_Delete extends _DiffOp {
        var $type = 'delete';
@@ -705,8 +717,7 @@ class _DiffOp_Delete extends _DiffOp {
 /**
  * @todo document
  * @private
- * @package MediaWiki
- * @subpackage DifferenceEngine
+ * @addtogroup DifferenceEngine
  */
 class _DiffOp_Add extends _DiffOp {
        var $type = 'add';
@@ -724,8 +735,7 @@ class _DiffOp_Add extends _DiffOp {
 /**
  * @todo document
  * @private
- * @package MediaWiki
- * @subpackage DifferenceEngine
+ * @addtogroup DifferenceEngine
  */
 class _DiffOp_Change extends _DiffOp {
        var $type = 'change';
@@ -762,8 +772,7 @@ class _DiffOp_Change extends _DiffOp {
  *
  * @author Geoffrey T. Dairiki, Tim Starling
  * @private
- * @package MediaWiki
- * @subpackage DifferenceEngine
+ * @addtogroup DifferenceEngine
  */
 class _DiffEngine
 {
@@ -1184,8 +1193,7 @@ class _DiffEngine
  * Class representing a 'diff' between two sequences of strings.
  * @todo document
  * @private
- * @package MediaWiki
- * @subpackage DifferenceEngine
+ * @addtogroup DifferenceEngine
  */
 class Diff
 {
@@ -1326,8 +1334,7 @@ class Diff
  * FIXME: bad name.
  * @todo document
  * @private
- * @package MediaWiki
- * @subpackage DifferenceEngine
+ * @addtogroup DifferenceEngine
  */
 class MappedDiff extends Diff
 {
@@ -1390,8 +1397,7 @@ class MappedDiff extends Diff
  * to obtain fancier outputs.
  * @todo document
  * @private
- * @package MediaWiki
- * @subpackage DifferenceEngine
+ * @addtogroup DifferenceEngine
  */
 class DiffFormatter
 {
@@ -1557,8 +1563,7 @@ define('NBSP', '&#160;');                 // iso-8859-x non-breaking space.
 /**
  * @todo document
  * @private
- * @package MediaWiki
- * @subpackage DifferenceEngine
+ * @addtogroup DifferenceEngine
  */
 class _HWLDF_WordAccumulator {
        function _HWLDF_WordAccumulator () {
@@ -1570,9 +1575,12 @@ class _HWLDF_WordAccumulator {
 
        function _flushGroup ($new_tag) {
                if ($this->_group !== '') {
-                       if ($this->_tag == 'mark')
-                               $this->_line .= '<span class="diffchange">' .
-                                       htmlspecialchars ( $this->_group ) . '</span>';
+                       if ($this->_tag == 'ins')
+                               $this->_line .= '<ins class="diffchange">' .
+                                       htmlspecialchars ( $this->_group ) . '</ins>';
+                       elseif ($this->_tag == 'del')
+                               $this->_line .= '<del class="diffchange">' .
+                                       htmlspecialchars ( $this->_group ) . '</del>';
                        else
                                $this->_line .= htmlspecialchars ( $this->_group );
                }
@@ -1616,8 +1624,7 @@ class _HWLDF_WordAccumulator {
 /**
  * @todo document
  * @private
- * @package MediaWiki
- * @subpackage DifferenceEngine
+ * @addtogroup DifferenceEngine
  */
 class WordLevelDiff extends MappedDiff
 {
@@ -1677,7 +1684,7 @@ class WordLevelDiff extends MappedDiff
                        if ($edit->type == 'copy')
                                $orig->addWords($edit->orig);
                        elseif ($edit->orig)
-                               $orig->addWords($edit->orig, 'mark');
+                               $orig->addWords($edit->orig, 'del');
                }
                $lines = $orig->getLines();
                wfProfileOut( $fname );
@@ -1693,7 +1700,7 @@ class WordLevelDiff extends MappedDiff
                        if ($edit->type == 'copy')
                                $closing->addWords($edit->closing);
                        elseif ($edit->closing)
-                               $closing->addWords($edit->closing, 'mark');
+                               $closing->addWords($edit->closing, 'ins');
                }
                $lines = $closing->getLines();
                wfProfileOut( $fname );
@@ -1705,8 +1712,7 @@ class WordLevelDiff extends MappedDiff
  *     Wikipedia Table style diff formatter.
  * @todo document
  * @private
- * @package MediaWiki
- * @subpackage DifferenceEngine
+ * @addtogroup DifferenceEngine
  */
 class TableDiffFormatter extends DiffFormatter
 {