Followup r58980: Moved logic for addsection-editintro/preload from SkinTemplate to...

Message names changed from talk-addsection-* to addsection-*.
Messages now contain the preload/editnotice themselves instead of the title of the page that contains them.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c06667d..227971f 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -273,8 +273,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * rebuildtextindex.php maintenance script now supports databases other than
   MySQL
 * upgrade1_5.php now requires to be run --update option to prevent confusion
-* (bug 17662) Customizable default preload/editintro in add-new-section link
-  for Talk page
+* (bug 17662) Customizable default preload/editintro for new sections in the
+  respective addsection-preload and addsection-editintro messages
 * Added maintenance script syntaxChecker.php that checks for PHP syntax errors
   and common coding mistakes
 * Updated Unicode normalization tables

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 99cc487..caf3f88 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -129,7 +129,10 @@ class EditPage {
                wfProfileIn( __METHOD__ );
                # Get variables from query string :P
                $section = $wgRequest->getVal( 'section' );
-               $preload = $wgRequest->getVal( 'preload' );
+                       
+               $preload = $wgRequest->getVal( 'preload', 
+                       // Custom preload text for new sections
+                       $section === 'new' ? 'MediaWiki:addsection-preload' : '' );
                $undoafter = $wgRequest->getVal( 'undoafter' );
                $undo = $wgRequest->getVal( 'undo' );
 
@@ -709,7 +712,9 @@ class EditPage {
                $this->oldid = $request->getInt( 'oldid' );
 
                $this->live = $request->getCheck( 'live' );
-               $this->editintro = $request->getText( 'editintro' );
+               $this->editintro = $request->getText( 'editintro',
+                       // Custom edit intro for new sections
+                       $this->section === 'new' ? 'MediaWiki:addsection-editintro' : '' );
 
                wfProfileOut( __METHOD__ );
 

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 9127d3e..cbe689f 100644 (file)
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -760,19 +760,10 @@ class SkinTemplate extends Skin {
                                // adds new section link if page is a current revision of a talk page or
                                if ( ( $wgArticle && $wgArticle->isCurrent() && $istalk ) || $wgOut->showNewSectionLink() ) {
                                        if ( !$wgOut->forceHideNewSectionLink() ) {
-                                               $urlArgs = 'action=edit&section=new';
-                                               $preloadMsg = wfMsgForContent( 'talk-addsection-preload' );
-                                               $editintroMsg = wfMsgForContent( 'talk-addsection-editintro' );
-                                               if( $preloadMsg != ''  ) {
-                                                       $urlArgs .= '&preload=' . urlencode( $preloadMsg );
-                                               }
-                                               if( $editintroMsg != '' ) {
-                                                       $urlArgs .= '&editintro=' . urlencode( $editintroMsg );
-                                               }
                                                $content_actions['addsection'] = array(
                                                        'class' => $section == 'new' ? 'selected' : false,
                                                        'text' => wfMsg( 'addsection' ),
-                                                       'href' => $this->mTitle->getLocalUrl( $urlArgs )
+                                                       'href' => $this->mTitle->getLocalUrl( 'action=edit&section=new' )
                                                );
                                        }
                                }

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 8e78c70..9530897 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1359,8 +1359,8 @@ It appears to have been deleted.',
 'edit-no-change'                   => 'Your edit was ignored, because no change was made to the text.',
 'edit-already-exists'              => 'Could not create a new page.
 It already exists.',
-'talk-addsection-preload'          => '', # do not translate or duplicate this message to other languages
-'talk-addsection-editintro'        => '', # do not translate or duplicate this message to other languages
+'addsection-preload'          => '', # do not translate or duplicate this message to other languages
+'addsection-editintro'        => '', # do not translate or duplicate this message to other languages
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => "'''Warning:''' This page contains too many expensive parser function calls.

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 4f0a52b..ef1d5b0 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -602,8 +602,8 @@ $wgMessageStructure = array(
                'edit-conflict',
                'edit-no-change',
                'edit-already-exists',
-               'talk-addsection-preload',
-               'talk-addsection-editintro',
+               'addsection-preload',
+               'addsection-editintro',
        ),
        'parserwarnings' => array(
                'expensive-parserfunction-warning',