Added placeholders for text injection by hooks to EditPage.php

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

diff --git a/includes/DifferenceEngine.php b/includes/DifferenceEngine.php
index 6dc82d6..8a6d9c5 100644 (file)
--- a/includes/DifferenceEngine.php
+++ b/includes/DifferenceEngine.php
@@ -5,10 +5,6 @@
  * @subpackage DifferenceEngine
  */
 
-/** */
-define( 'MAX_DIFF_LINE', 10000 );
-define( 'MAX_DIFF_XREF_LENGTH', 10000 );
-
 /**
  * @todo document
  * @public
@@ -152,11 +148,7 @@ CONTROL;
                $contribs = wfMsg( 'contribslink' );
 
                if ( $this->mNewRev->isCurrent() && $wgUser->isAllowed('rollback') ) {
-                       $username = $this->mNewRev->getUserText();
-                       $rollback = '&nbsp;&nbsp;&nbsp;<strong>[' . $sk->makeKnownLinkObj( $this->mTitle, wfMsg( 'rollbacklink' ),
-                               'action=rollback&from=' . urlencode( $username ) .
-                               '&token=' . urlencode( $wgUser->editToken( array( $this->mTitle->getPrefixedText(), $username ) ) ) ) .
-                               ']</strong>';
+                       $rollback = '&nbsp;&nbsp;&nbsp;' . $sk->generateRollback( $this->mNewRev );
                } else {
                        $rollback = '';
                }
@@ -175,13 +167,26 @@ CONTROL;
                                'diff=next&oldid='.$this->mNewid, '', '', 'id="differences-nextlink"' );
                }
 
+               $oldminor = '';
+               $newminor = '';
+
+               if ($this->mOldRev->mMinorEdit == 1) {
+                       $oldminor = wfElement( 'span', array( 'class' => 'minor' ),
+                               wfMsg( 'minoreditletter') ) . ' ';
+               }
+
+                if ($this->mNewRev->mMinorEdit == 1) {
+                        $newminor = wfElement( 'span', array( 'class' => 'minor' ),
+                               wfMsg( 'minoreditletter') ) . ' ';
+                }
+
                $oldHeader = "<strong>{$this->mOldtitle}</strong><br />" .
                        $sk->revUserTools( $this->mOldRev ) . "<br />" .
-                       $sk->revComment( $this->mOldRev ) . "<br />" .
+                       $oldminor . $sk->revComment( $this->mOldRev, true ) . "<br />" .
                        $prevlink;
                $newHeader = "<strong>{$this->mNewtitle}</strong><br />" .
                        $sk->revUserTools( $this->mNewRev ) . " $rollback<br />" .
-                       $sk->revComment( $this->mNewRev ) . "<br />" .
+                       $newminor . $sk->revComment( $this->mNewRev, true ) . "<br />" .
                        $nextlink . $patrol;
 
                $this->showDiff( $oldHeader, $newHeader );
@@ -301,7 +306,7 @@ CONTROL;
         * Returns false on error
         */
        function getDiffBody() {
-               global $wgMemc, $wgDBname;
+               global $wgMemc;
                $fname = 'DifferenceEngine::getDiffBody';
                wfProfileIn( $fname );
                
@@ -309,7 +314,7 @@ CONTROL;
                $key = false;
                if ( $this->mOldid && $this->mNewid ) {
                        // Try cache
-                       $key = "$wgDBname:diff:oldid:{$this->mOldid}:newid:{$this->mNewid}";
+                       $key = wfMemcKey( 'diff', 'oldid', $this->mOldid, 'newid', $this->mNewid );
                        $difftext = $wgMemc->get( $key );
                        if ( $difftext ) {
                                wfIncrStats( 'diff_cache_hit' );
@@ -724,6 +729,8 @@ class _DiffOp_Change extends _DiffOp {
  */
 class _DiffEngine
 {
+       const MAX_XREF_LENGTH =  10000;
+
        function diff ($from_lines, $to_lines) {
                $fname = '_DiffEngine::diff';
                wfProfileIn( $fname );
@@ -821,7 +828,7 @@ class _DiffEngine
         * Returns the whole line if it's small enough, or the MD5 hash otherwise
         */
        function _line_hash( $line ) {
-               if ( strlen( $line ) > MAX_DIFF_XREF_LENGTH ) {
+               if ( strlen( $line ) > self::MAX_XREF_LENGTH ) {
                        return md5( $line );
                } else {
                        return $line;
@@ -1576,6 +1583,8 @@ class _HWLDF_WordAccumulator {
  */
 class WordLevelDiff extends MappedDiff
 {
+       const MAX_LINE_LENGTH = 10000;
+
        function WordLevelDiff ($orig_lines, $closing_lines) {
                $fname = 'WordLevelDiff::WordLevelDiff';
                wfProfileIn( $fname );
@@ -1604,7 +1613,7 @@ class WordLevelDiff extends MappedDiff
                                $words[] = "\n";
                                $stripped[] = "\n";
                        }
-                       if ( strlen( $line ) > MAX_DIFF_LINE ) {
+                       if ( strlen( $line ) > self::MAX_LINE_LENGTH ) {
                                $words[] = $line;
                                $stripped[] = $line;
                        } else {