From: Rob Church <robchurch@users.mediawiki.org>
Date: Tue, 28 Aug 2007 15:31:16 +0000 (+0000)
Subject: (bug 11095) Honour "preview on first edit" preference when preloading text for a... 
X-Git-Tag: 1.31.0-rc.0~51622
X-Git-Url: https://git.cyclocoop.org/admin/?a=commitdiff_plain;h=de05ea923c714fea425befb875c1e4ac9d8cde88;p=lhc%2Fweb%2Fwiklou.git

(bug 11095) Honour "preview on first edit" preference when preloading text for a non-existent page
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f3bfd9e097..a76eaa7e58 100644
--- 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 4cd776fa53..3f0d6992e3 100644
--- 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 ) {