(bug 5458) Fix double-URL encoding in block log link in contribs and contribs link...

diff --git a/includes/LogPage.php b/includes/LogPage.php
index 2e72ba0..432f719 100644 (file)
--- a/includes/LogPage.php
+++ b/includes/LogPage.php
@@ -191,7 +191,7 @@ class LogPage {
                                                                $titleLink = $title->getText();
                                                        } else {
                                                                $titleLink = $skin->makeLinkObj( $title, $title->getText() );
-                                                               $titleLink .= ' (' . $skin->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Contributions/' . urlencode( $title->getDBkey() ) ), wfMsg( 'contribslink' ) ) . ')';
+                                                               $titleLink .= ' (' . $skin->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Contributions/' . $title->getDBkey() ), wfMsg( 'contribslink' ) ) . ')';
                                                        }
                                                        break;
                                                default:

diff --git a/includes/SpecialContributions.php b/includes/SpecialContributions.php
index a676959..d13b30d 100644 (file)
--- a/includes/SpecialContributions.php
+++ b/includes/SpecialContributions.php
@@ -226,7 +226,7 @@ function wfSpecialContributions( $par = null ) {
                if( ( $id != 0 && $wgSysopUserBans ) || ( $id == 0 && User::isIP( $nt->getText() ) ) ) {
                        # Block link
                        if( $wgUser->isAllowed( 'block' ) )
-                               $tools[] = $sk->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Blockip/' . $nt->getPartialUrl() ), wfMsgHtml( 'blocklink' ) );
+                               $tools[] = $sk->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Blockip/' . $nt->getDBkey() ), wfMsgHtml( 'blocklink' ) );
                        # Block log link
                        $tools[] = $sk->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Log' ), htmlspecialchars( LogPage::logName( 'block' ) ), 'type=block&page=' . $nt->getPrefixedUrl() );
                }