(bug 11095) Honour "preview on first edit" preference when preloading text for a...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f3bfd9e..a76eaa7 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -190,6 +190,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Add accesskey 's' and tooltip to 'upload file' button at Special:Upload
 * Introduced 'SkinAfterBottomScripts' hook; see docs/hooks.txt for
   more information
+* (bug 11095) Honour "preview on first edit" preference when preloading
+  text for a non-existent page
 
 == Bugfixes since 1.10 ==
 

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 4cd776f..3f0d699 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -449,7 +449,7 @@ class EditPage {
                } elseif( $this->section == 'new' ) {
                        // Nothing *to* preview for new sections
                        return false;
-               } elseif( $this->mTitle->exists() && $wgUser->getOption( 'previewonfirst' ) ) {
+               } elseif( ( $wgRequest->getVal( 'preload' ) !== '' || $this->mTitle->exists() ) && $wgUser->getOption( 'previewonfirst' ) ) {
                        // Standard preference behaviour
                        return true;
                } elseif( !$this->mTitle->exists() && $this->mTitle->getNamespace() == NS_CATEGORY ) {