From 62732def2bdcd3803605046ae99b9f2327062354 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <siebrand@users.mediawiki.org>
Date: Mon, 2 Feb 2009 16:29:51 +0000
Subject: [PATCH] (bug 17283) Remove double URL escaping in show/hide links for
 log entries and RevisionDeleteForm::__construct. Patch contributed by
 Mormegil.

---
 RELEASE-NOTES                               | 2 ++
 includes/LogEventsList.php                  | 2 +-
 includes/specials/SpecialRevisiondelete.php | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index ee7d10a027..c2dc802de2 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -132,6 +132,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 14938) Removing a section no longer leaves excess whitespace
 * (bug 17304) Fixed fatal error when thumbnails couldn't be generated for file
   history
+* (bug 17283) Remove double URL escaping in show/hide links for log entries
+  and RevisionDeleteForm::__construct.
 
 == API changes in 1.15 ==
 * (bug 16858) Revamped list=deletedrevs to make listing deleted contributions
diff --git a/includes/LogEventsList.php b/includes/LogEventsList.php
index c8ddd07092..1bf4ec0909 100644
--- a/includes/LogEventsList.php
+++ b/includes/LogEventsList.php
@@ -387,7 +387,7 @@ class LogEventsList {
 			$del = Xml::tags( 'span', array( 'class'=>'mw-revdelundel-link' ), '('.$this->message['rev-delundel'].')' );
 		} else {
 			$target = SpecialPage::getTitleFor( 'Log', $row->log_type );
-			$query = array( 'target' => $target->getPrefixedUrl(),
+			$query = array( 'target' => $target->getPrefixedDBkey(),
 				'logid' => $row->log_id
 			);
 			$del = $this->skin->revDeleteLink( $query, self::isDeleted( $row, LogPage::DELETED_RESTRICTED ) );
diff --git a/includes/specials/SpecialRevisiondelete.php b/includes/specials/SpecialRevisiondelete.php
index c0247d87fd..f39f80f611 100644
--- a/includes/specials/SpecialRevisiondelete.php
+++ b/includes/specials/SpecialRevisiondelete.php
@@ -107,7 +107,7 @@ class RevisionDeleteForm {
 			if( $wgUser->isAllowed('undelete') ) {
 				$undelete = SpecialPage::getTitleFor( 'Undelete' );
 				$links[] = $this->skin->makeKnownLinkObj( $undelete, wfMsgHtml( 'deletedhist' ),
-					wfArrayToCGI( array( 'target' => $this->page->getPrefixedUrl() ) ) );
+					wfArrayToCGI( array( 'target' => $this->page->getPrefixedDBkey() ) ) );
 			}
 			# Logs themselves don't have histories or archived revisions
 			$wgOut->setSubtitle( '<p>'.implode($links,' / ').'</p>' );
-- 
2.20.1