From 8d5e8ccfa1726e70ef3e2382ebe88842b753d3a7 Mon Sep 17 00:00:00 2001 From: John Du Hart Date: Thu, 1 Sep 2011 21:32:55 +0000 Subject: [PATCH] Revert r95930, r95931 and r95939. Poorly commited patch --- RELEASE-NOTES-1.19 | 1 - includes/EditPage.php | 9 --------- languages/messages/MessagesEn.php | 1 - maintenance/language/messages.inc | 1 - 4 files changed, 12 deletions(-) diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19 index 8524624e3a..33286642de 100644 --- 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 7ef26628a0..90434a47d3 100644 --- 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( "
\n$1\n
", array( 'readonlywarning', wfReadOnlyReason() ) ); } elseif ( $wgUser->isAnon() ) { diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index ac39029915..98b37122f9 100644 --- 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 d528e33ccd..9caf7e5b39 100644 --- 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', ), -- 2.20.1