Revert r95930, r95931 and r95939. Poorly commited patch

diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index 8524624..3328664 100644 (file)
--- a/RELEASE-NOTES-1.19
+++ b/RELEASE-NOTES-1.19
@@ -51,7 +51,6 @@ production.
 * (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

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 7ef2662..90434a4 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1605,15 +1605,6 @@ HTML
                        }
                }
 
-               $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() ) {

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index ac39029..98b3712 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1437,7 +1437,6 @@ 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.',
-'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
 

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index d528e33..9caf7e5 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -664,7 +664,6 @@ $wgMessageStructure = array(
                'edit-conflict',
                'edit-no-change',
                'edit-already-exists',
-               'editinguserpage',
                'addsection-preload',
                'addsection-editintro',
        ),