* Don't show empty-page text in 'Show changes' on new page

Changed $noredir on Article::fetchContent() to a more reasonable default.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 4375dbe..f6d5635 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -413,6 +413,7 @@ Various bugfixes, small features, and a few experimental things:
 * (bug 2572) Fix edit conflict handling
 * (bug 2595) Show "Earlier" and "Latest" links on history go to the first/last
   page in the article history pager.
+* Don't show empty-page text in 'Show changes' on new page
 
 
 === Caveats ===

diff --git a/includes/Article.php b/includes/Article.php
index fdefb53..e1a5ab0 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -325,11 +325,11 @@ class Article {
        /**
         * Get text of an article from database
         * @param int $oldid 0 for whatever the latest revision is
-        * @param bool $noredir Set to true to avoid following redirects
+        * @param bool $noredir Set to false to follow redirects
         * @param bool $globalTitle Set to true to change the global $wgTitle object when following redirects or other unexpected title changes
         * @return string
         */
-       function fetchContent( $oldid = 0, $noredir = false, $globalTitle = false ) {
+       function fetchContent( $oldid = 0, $noredir = true, $globalTitle = false ) {
                if ( $this->mContentLoaded ) {
                        return $this->mContent;
                }
@@ -524,7 +524,7 @@ class Article {
        function isRedirect( $text = false ) {
                if ( $text === false ) {
                        $this->loadContent();
-                       $titleObj = Title::newFromRedirect( $this->fetchContent( false, true ) );
+                       $titleObj = Title::newFromRedirect( $this->fetchContent() );
                } else {
                        $titleObj = Title::newFromRedirect( $text );
                }

diff --git a/includes/EditPage.php b/includes/EditPage.php
index f159470..43d9dc5 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1100,7 +1100,7 @@ END
         */
        function getDiff() {
                require_once( 'DifferenceEngine.php' );
-               $oldtext = $this->mArticle->getContent( true );
+               $oldtext = $this->mArticle->fetchContent();
                $newtext = $this->mArticle->getTextOfLastEditWithSectionReplacedOrAdded(
                        $this->section, $this->textbox1, $this->summary, $this->edittime );
                $oldtitle = wfMsg( 'currentrev' );