(bug 17283) Remove double URL escaping in show/hide links for log entries and Revisio...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index ee7d10a..c2dc802 100644 (file)
--- 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 c8ddd07..1bf4ec0 100644 (file)
--- 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 c0247d8..f39f80f 100644 (file)
--- 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>' );