Revert r14768, it's broken.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 96f9f7a..bfd2013 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -496,8 +496,6 @@ Some default configuration options have changed:
 * (bug 6296) Update to Indonesian localisation (id) #21
 * Introduce EditFormPreloadText hook, see docs/hooks.txt for more information
 * (bug 6095) Introduce RunUnknownJob hook, see docs/hooks.txt for more information
-* (bug 5865) Show warning when editing another users' user page and provide a link to edit
-  their talk page instead
 
 == Compatibility ==
 

diff --git a/includes/EditPage.php b/includes/EditPage.php
index ba11227..a3c98d6 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -814,15 +814,6 @@ class EditPage {
                        }
                }
 
-               $curUP = $wgUser->getUserPage();
-               $editingOTP = substr( $this->mTitle->getPrefixedText(), 0, strlen( $curUP->getPrefixedText() ) ) != $curUP->getPrefixedText()
-                       && $this->formtype != 'preview'
-                       && $this->formtype != 'diff';
-               if( $editingOTP ) {
-                       $utpLink = $sk->makeKnownLinkObj( $this->mTitle->getTalkPage(), wfMsgHtml( 'editinguserpagetalklink' ), 'action=edit' );
-                       $wgOut->addHtml( wfMsgWikiHtml( 'editinguserpage', $utpLink ) );
-               }
-
                if( wfReadOnly() ) {
                        $wgOut->addWikiText( wfMsg( 'readonlywarning' ) );
                } elseif( $wgUser->isAnon() && $this->formtype != 'preview' ) {

diff --git a/languages/Messages.php b/languages/Messages.php
index d90b467..ffdc013 100644 (file)
--- a/languages/Messages.php
+++ b/languages/Messages.php
@@ -468,8 +468,6 @@ format. Please enter a well-formatted address or empty that field.',
 'showdiff'     => 'Show changes',
 'anoneditwarning' => "'''Warning:''' You are not logged in. Your IP address will be recorded in this page's edit history.",
 'missingsummary' => "'''Reminder:''' You have not provided an edit summary. If you click Save again, your edit will be saved without one.",
-'editinguserpage' => "'''Note:''' You are editing a [[Help:User page|user page]]. To leave this user a message, $1.",
-'editinguserpagetalklink' => 'edit their talk page',
 'missingcommenttext' => 'Please enter a comment below.',
 'blockedtitle' => 'User is blocked',
 'blockedtext'  => 'Your user name or IP address has been blocked by $1.