* (bug 6243) Fix email for usernames containing dots when using PEAR::Mail

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

diff --git a/includes/DifferenceEngine.php b/includes/DifferenceEngine.php
index beab95b..490a889 100644 (file)
--- a/includes/DifferenceEngine.php
+++ b/includes/DifferenceEngine.php
@@ -6,20 +6,18 @@
  */
 
 /** */
-require_once( 'Revision.php' );
-
 define( 'MAX_DIFF_LINE', 10000 );
 define( 'MAX_DIFF_XREF_LENGTH', 10000 );
 
 /**
  * @todo document
- * @access public
+ * @public
  * @package MediaWiki
  * @subpackage DifferenceEngine
  */
 class DifferenceEngine {
        /**#@+
-        * @access private
+        * @private
         */
        var $mOldid, $mNewid, $mTitle;
        var $mOldtitle, $mNewtitle, $mPagetitle;
@@ -33,10 +31,10 @@ class DifferenceEngine {
 
        /**
         * Constructor
-        * @param Title $titleObj Title object that the diff is associated with
-        * @param integer $old Old ID we want to show and diff with.
-        * @param string $new Either 'prev' or 'next'.
-        * @param integer $rcid ??? (default 0)
+        * @param $titleObj Title object that the diff is associated with
+        * @param $old Integer: old ID we want to show and diff with.
+        * @param $new String: either 'prev' or 'next'.
+        * @param $rcid Integer: ??? FIXME (default 0)
         */
        function DifferenceEngine( $titleObj = null, $old = 0, $new = 0, $rcid = 0 ) {
                $this->mTitle = $titleObj;
@@ -114,6 +112,9 @@ CONTROL;
                        wfProfileOut( $fname );
                        return;
                }
+               
+               wfRunHooks( 'DiffViewHeader', array( $this, $this->mOldRev, $this->mNewRev ) );
+
                if ( $this->mNewRev->isCurrent() ) {
                        $wgOut->setArticleFlag( true );
                }
@@ -137,7 +138,7 @@ CONTROL;
                        $wgOut->setPageTitle( $oldTitle . ', ' . $newTitle );
                }
                $wgOut->setSubtitle( wfMsg( 'difference' ) );
-               $wgOut->setRobotpolicy( 'noindex,follow' );
+               $wgOut->setRobotpolicy( 'noindex,nofollow' );
 
                if ( !( $this->mOldPage->userCanRead() && $this->mNewPage->userCanRead() ) ) {
                        $wgOut->loginToUse();
@@ -426,7 +427,7 @@ CONTROL;
 
        function localiseLineNumbersCb( $matches ) {
                global $wgLang;
-               return wfMsg( 'lineno', $wgLang->formatNum( $matches[1] ) );
+               return wfMsgExt( 'lineno', array('parseinline'), $wgLang->formatNum( $matches[1] ) );
        }
 
        /**
@@ -486,17 +487,19 @@ CONTROL;
 
                // Set assorted variables
                if( $this->mNewRev->isCurrent() ) {
-                       $this->mPagetitle = htmlspecialchars( wfMsg( 'currentrev' ) );
                        $this->mNewPage = $this->mTitle;
                        $newLink = $this->mNewPage->escapeLocalUrl();
-                       $this->mNewtitle = "<a href='$newLink'>{$this->mPagetitle}</a>";
+                       $this->mPagetitle = htmlspecialchars( wfMsg( 'currentrev' ) );
+                       $newEdit = $this->mNewPage->escapeLocalUrl( 'action=edit' );
                } else {
                        $this->mNewPage = $this->mNewRev->getTitle();
-                       $newLink = $this->mNewPage->escapeLocalUrl ('oldid=' . $this->mNewid );
+                       $newLink = $this->mNewPage->escapeLocalUrl( 'oldid=' . $this->mNewid );
+                       $newEdit = $this->mNewPage->escapeLocalUrl( 'action=edit&oldid=' . $this->mNewid );
                        $t = $wgLang->timeanddate( $this->mNewRev->getTimestamp(), true );
                        $this->mPagetitle = htmlspecialchars( wfMsg( 'revisionasof', $t ) );
-                       $this->mNewtitle = "<a href='$newLink'>{$this->mPagetitle}</a>";
                }
+               $this->mNewtitle = "<strong><a href='$newLink'>{$this->mPagetitle}</a></strong>"
+                       . " (<a href='$newEdit'>" . htmlspecialchars( wfMsg( 'editold' ) ) . "</a>)";
 
                // Load the old revision object
                $this->mOldRev = false;
@@ -523,7 +526,9 @@ CONTROL;
 
                        $t = $wgLang->timeanddate( $this->mOldRev->getTimestamp(), true );
                        $oldLink = $this->mOldPage->escapeLocalUrl( 'oldid=' . $this->mOldid );
-                       $this->mOldtitle = "<a href='$oldLink'>" . htmlspecialchars( wfMsg( 'revisionasof', $t ) ) . '</a>';
+                       $oldEdit = $this->mOldPage->escapeLocalUrl( 'action=edit&oldid=' . $this->mOldid );
+                       $this->mOldtitle = "<strong><a href='$oldLink'>" . htmlspecialchars( wfMsg( 'revisionasof', $t ) )
+                               . "</a></strong> (<a href='$oldEdit'>" . htmlspecialchars( wfMsg( 'editold' ) ) . "</a>)";
                }
 
                return true;
@@ -588,7 +593,7 @@ define('USE_ASSERTS', function_exists('assert'));
 
 /**
  * @todo document
- * @access private
+ * @private
  * @package MediaWiki
  * @subpackage DifferenceEngine
  */
@@ -612,7 +617,7 @@ class _DiffOp {
 
 /**
  * @todo document
- * @access private
+ * @private
  * @package MediaWiki
  * @subpackage DifferenceEngine
  */
@@ -633,7 +638,7 @@ class _DiffOp_Copy extends _DiffOp {
 
 /**
  * @todo document
- * @access private
+ * @private
  * @package MediaWiki
  * @subpackage DifferenceEngine
  */
@@ -652,7 +657,7 @@ class _DiffOp_Delete extends _DiffOp {
 
 /**
  * @todo document
- * @access private
+ * @private
  * @package MediaWiki
  * @subpackage DifferenceEngine
  */
@@ -671,7 +676,7 @@ class _DiffOp_Add extends _DiffOp {
 
 /**
  * @todo document
- * @access private
+ * @private
  * @package MediaWiki
  * @subpackage DifferenceEngine
  */
@@ -709,7 +714,7 @@ class _DiffOp_Change extends _DiffOp {
  * Line length limits for robustness added by Tim Starling, 2005-08-31
  *
  * @author Geoffrey T. Dairiki, Tim Starling
- * @access private
+ * @private
  * @package MediaWiki
  * @subpackage DifferenceEngine
  */
@@ -1129,7 +1134,7 @@ class _DiffEngine
 /**
  * Class representing a 'diff' between two sequences of strings.
  * @todo document
- * @access private
+ * @private
  * @package MediaWiki
  * @subpackage DifferenceEngine
  */
@@ -1271,7 +1276,7 @@ class Diff
 /**
  * FIXME: bad name.
  * @todo document
- * @access private
+ * @private
  * @package MediaWiki
  * @subpackage DifferenceEngine
  */
@@ -1335,7 +1340,7 @@ class MappedDiff extends Diff
  * It is intended that this class be customized via inheritance,
  * to obtain fancier outputs.
  * @todo document
- * @access private
+ * @private
  * @package MediaWiki
  * @subpackage DifferenceEngine
  */
@@ -1502,7 +1507,7 @@ define('NBSP', '&#160;');                 // iso-8859-x non-breaking space.
 
 /**
  * @todo document
- * @access private
+ * @private
  * @package MediaWiki
  * @subpackage DifferenceEngine
  */
@@ -1561,7 +1566,7 @@ class _HWLDF_WordAccumulator {
 
 /**
  * @todo document
- * @access private
+ * @private
  * @package MediaWiki
  * @subpackage DifferenceEngine
  */
@@ -1647,7 +1652,7 @@ class WordLevelDiff extends MappedDiff
 /**
  *     Wikipedia Table style diff formatter.
  * @todo document
- * @access private
+ * @private
  * @package MediaWiki
  * @subpackage DifferenceEngine
  */