* (bug 17163) Added MediaWiki:Talkpage which will be displayed when viewing talk...

This will be very use on the French Wikipedia to display links to realted pages, e.g. deletion request without having to add a template on every talk page

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 0a70d97..783f353 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -151,6 +151,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Add a class if 'missingsummary' is triggered to allow styling of the summary
   line
 * Add CSS defintion of the 'wikitable' class to shared.css
+* (bug 17163) Added MediaWiki:Talkpage which will be displayed when viewing talk
+  pages
 
 === Bug fixes in 1.15 ===
 * (bug 16968) Special:Upload no longer throws useless warnings.

diff --git a/includes/Article.php b/includes/Article.php
index 4bebaa4..9f39d37 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -865,6 +865,13 @@ class Article {
                        }
                }
 
+               # Allow a specific header on talk pages, like [[MediaWiki:Talkpagetext]]
+               if( $this->mTitle->isTalkPage() ) {
+                       if ( wfMsgForContent( 'talkpageheader' ) != '-' ) {
+                               $wgOut->addWikiMsgArray( 'talkpageheader', array(), array( 'content' ) );
+                       }
+               }
+
                $outputDone = false;
                wfRunHooks( 'ArticleViewHeader', array( &$this, &$outputDone, &$pcache ) );
                if( $pcache && $wgOut->tryParserCache( $this ) ) {

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index be6408c..8ee63de 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -692,6 +692,7 @@ XHTML id names.
 'otherlanguages'    => 'In other languages',
 'redirectedfrom'    => '(Redirected from $1)',
 'redirectpagesub'   => 'Redirect page',
+'talkpageheader'    => '-',
 'lastmodifiedat'    => 'This page was last modified on $1, at $2.', # $1 date, $2 time
 'viewcount'         => 'This page has been accessed {{PLURAL:$1|once|$1 times}}.',
 'protectedpage'     => 'Protected page',

diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc
index d155db9..f5104b9 100644 (file)
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -69,6 +69,7 @@ $wgIgnoredMessages = array(
        'accesskey-watch',
        'accesskey-upload',
        'addsection',
+       'talkpageheader',
        'anonnotice',
        'autoblock_whitelist',
        'searchmenu-help',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 6f3abc1..700a51e 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -211,6 +211,7 @@ $wgMessageStructure = array(
                'otherlanguages',
                'redirectedfrom',
                'redirectpagesub',
+               'talkpageheader',
                'lastmodifiedat',
                'viewcount',
                'protectedpage',