http://www.mediawiki.org/wiki/Special:Code/MediaWiki/96046
Revision: 96046
Author: johnduhart
Date: 2011-09-01 21:32:55 +0000 (Thu, 01 Sep 2011)
Log Message:
-----------
Revert r95930, r95931 and r95939. Poorly commited patch
Modified Paths:
--------------
trunk/phase3/RELEASE-NOTES-1.19
trunk/phase3/includes/EditPage.php
trunk/phase3/languages/messages/MessagesEn.php
trunk/phase3/maintenance/language/messages.inc
Modified: trunk/phase3/RELEASE-NOTES-1.19
===================================================================
--- trunk/phase3/RELEASE-NOTES-1.19 2011-09-01 21:27:20 UTC (rev 96045)
+++ trunk/phase3/RELEASE-NOTES-1.19 2011-09-01 21:32:55 UTC (rev 96046)
@@ -51,7 +51,6 @@
* (bug 30344) Add configuration variable for setting custom priorities when
generating sitemaps
* (bug 16428) Include permalink in printable version
-* (bug 5865) Warning on editing other user's userpage
=== Bug fixes in 1.19 ===
* $wgUploadNavigationUrl should be used for file redlinks if
Modified: trunk/phase3/includes/EditPage.php
===================================================================
--- trunk/phase3/includes/EditPage.php 2011-09-01 21:27:20 UTC (rev 96045)
+++ trunk/phase3/includes/EditPage.php 2011-09-01 21:32:55 UTC (rev 96046)
@@ -1605,15 +1605,6 @@
}
}
- $curUP = $wgUser->getUserPage();
- if ( $this->mTitle->getNamespace() == NS_USER
- && substr( $this->mTitle->getPrefixedText(), 0, strlen(
$curUP->getPrefixedText() ) ) != $curUP->getPrefixedText()
- && $this->formtype != 'preview'
- && $this->formtype != 'diff' )
- {
- $wgOut->addHTML( wfMessage( 'editinguserpage',
$this->mTitle->getTalkPage()->getFullURL( 'action=edit' ) )->parse() );
- }
-
if ( wfReadOnly() ) {
$wgOut->wrapWikiMsg( "<div
id=\"mw-read-only-warning\">\n$1\n</div>", array( 'readonlywarning',
wfReadOnlyReason() ) );
} elseif ( $wgUser->isAnon() ) {
Modified: trunk/phase3/languages/messages/MessagesEn.php
===================================================================
--- trunk/phase3/languages/messages/MessagesEn.php 2011-09-01 21:27:20 UTC
(rev 96045)
+++ trunk/phase3/languages/messages/MessagesEn.php 2011-09-01 21:32:55 UTC
(rev 96046)
@@ -1437,7 +1437,6 @@
'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.',
-'editinguserpage' => "'''Note:''' You are editing a
[[Help:User page|user page]]. To leave this user a message, [$1 edit their talk
page].",
'addsection-preload' => '', # do not translate or duplicate this
message to other languages
'addsection-editintro' => '', # do not translate or duplicate this
message to other languages
Modified: trunk/phase3/maintenance/language/messages.inc
===================================================================
--- trunk/phase3/maintenance/language/messages.inc 2011-09-01 21:27:20 UTC
(rev 96045)
+++ trunk/phase3/maintenance/language/messages.inc 2011-09-01 21:32:55 UTC
(rev 96046)
@@ -664,7 +664,6 @@
'edit-conflict',
'edit-no-change',
'edit-already-exists',
- 'editinguserpage',
'addsection-preload',
'addsection-editintro',
),
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
