r96046 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r96045‎ | r96046 | r96047 >
Date:21:32, 1 September 2011
Author:johnduhart
Status:ok
Tags:
Comment:
Revert r95930, r95931 and r95939. Poorly commited patch
Modified paths:
  • /trunk/phase3/RELEASE-NOTES-1.19 (modified) (history)
  • /trunk/phase3/includes/EditPage.php (modified) (history)
  • /trunk/phase3/languages/messages/MessagesEn.php (modified) (history)
  • /trunk/phase3/maintenance/language/messages.inc (modified) (history)

Diff [purge]

Index: trunk/phase3/maintenance/language/messages.inc
@@ -664,7 +664,6 @@
665665 'edit-conflict',
666666 'edit-no-change',
667667 'edit-already-exists',
668 - 'editinguserpage',
669668 'addsection-preload',
670669 'addsection-editintro',
671670 ),
Index: trunk/phase3/RELEASE-NOTES-1.19
@@ -51,7 +51,6 @@
5252 * (bug 30344) Add configuration variable for setting custom priorities when
5353 generating sitemaps
5454 * (bug 16428) Include permalink in printable version
55 -* (bug 5865) Warning on editing other user's userpage
5655
5756 === Bug fixes in 1.19 ===
5857 * $wgUploadNavigationUrl should be used for file redlinks if
Index: trunk/phase3/includes/EditPage.php
@@ -1605,15 +1605,6 @@
16061606 }
16071607 }
16081608
1609 - $curUP = $wgUser->getUserPage();
1610 - if ( $this->mTitle->getNamespace() == NS_USER
1611 - && substr( $this->mTitle->getPrefixedText(), 0, strlen( $curUP->getPrefixedText() ) ) != $curUP->getPrefixedText()
1612 - && $this->formtype != 'preview'
1613 - && $this->formtype != 'diff' )
1614 - {
1615 - $wgOut->addHTML( wfMessage( 'editinguserpage', $this->mTitle->getTalkPage()->getFullURL( 'action=edit' ) )->parse() );
1616 - }
1617 -
16181609 if ( wfReadOnly() ) {
16191610 $wgOut->wrapWikiMsg( "<div id=\"mw-read-only-warning\">\n$1\n</div>", array( 'readonlywarning', wfReadOnlyReason() ) );
16201611 } elseif ( $wgUser->isAnon() ) {
Index: trunk/phase3/languages/messages/MessagesEn.php
@@ -1437,7 +1437,6 @@
14381438 'edit-no-change' => 'Your edit was ignored, because no change was made to the text.',
14391439 'edit-already-exists' => 'Could not create a new page.
14401440 It already exists.',
1441 -'editinguserpage' => "'''Note:''' You are editing a [[Help:User page|user page]]. To leave this user a message, [$1 edit their talk page].",
14421441 'addsection-preload' => '', # do not translate or duplicate this message to other languages
14431442 'addsection-editintro' => '', # do not translate or duplicate this message to other languages
14441443

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r95930(bug 5865) Warning on editing other user's userpagejohnduhart03:56, 1 September 2011
r95931Follow-up r95930, consolidate into one message per CRjohnduhart04:26, 1 September 2011
r95939f'up r95930: register new message key to maintenance scriptraymond06:18, 1 September 2011

Status & tagging log