| Index: trunk/phase3/includes/SkinTemplate.php |
| — | — | @@ -674,21 +674,24 @@ |
| 675 | 675 | ); |
| 676 | 676 | } |
| 677 | 677 | if ( $this->mTitle->userCanMove()) { |
| | 678 | + echo( "Making move link...\n" ); |
| 678 | 679 | $moveTitle = Title::makeTitle( NS_SPECIAL, 'Movepage' ); |
| 679 | 680 | $content_actions['move'] = array( |
| 680 | 681 | 'class' => ($this->mTitle->getDbKey() == 'Movepage' and $this->mTitle->getNamespace == NS_SPECIAL) ? 'selected' : false, |
| 681 | 682 | 'text' => wfMsg('move'), |
| 682 | | - 'href' => $moveTitle->getLocalUrl( 'target=' . $this->thispage ) |
| | 683 | + 'href' => $moveTitle->getLocalUrl( 'target=' . urlencode( $this->thispage ) ) |
| 683 | 684 | ); |
| 684 | 685 | } |
| 685 | 686 | } else { |
| 686 | 687 | //article doesn't exist or is deleted |
| 687 | | - if($wgUser->isAllowed('delete')){ |
| | 688 | + if( $wgUser->isAllowed( 'delete' ) ) { |
| 688 | 689 | if( $n = $this->mTitle->isDeleted() ) { |
| | 690 | + $undelTitle = Title::makeTitle( NS_SPECIAL, 'Undelete' ); |
| 689 | 691 | $content_actions['undelete'] = array( |
| 690 | 692 | 'class' => false, |
| 691 | 693 | 'text' => ($n == 1) ? wfMsg( 'undelete_short1' ) : wfMsg('undelete_short', $n ), |
| 692 | | - 'href' => $this->makeSpecialUrl("Undelete/$this->thispage") |
| | 694 | + 'href' => $undelTitle->getLocalUrl( 'target=' . urlencode( $this->thispage ) ) |
| | 695 | + #'href' => $this->makeSpecialUrl("Undelete/$this->thispage") |
| 693 | 696 | ); |
| 694 | 697 | } |
| 695 | 698 | } |
| — | — | @@ -820,13 +823,12 @@ |
| 821 | 824 | if( $this->mTitle->getNamespace() != NS_SPECIAL ) { |
| 822 | 825 | $wlhTitle = Title::makeTitle( NS_SPECIAL, 'Whatlinkshere' ); |
| 823 | 826 | $nav_urls['whatlinkshere'] = array( |
| 824 | | - 'href' => $wlhTitle->getLocalUrl( 'target=' . $this->thispage ) |
| | 827 | + 'href' => $wlhTitle->getLocalUrl( 'target=' . urlencode( $this->thispage ) ) |
| 825 | 828 | ); |
| 826 | 829 | if( $this->mTitle->getArticleId() ) { |
| 827 | 830 | $rclTitle = Title::makeTitle( NS_SPECIAL, 'Recentchangeslinked' ); |
| 828 | 831 | $nav_urls['recentchangeslinked'] = array( |
| 829 | | - 'href' => $rclTitle->getLocalUrl( 'target=' . $this->thispage ) |
| 830 | | - #'href' => $this->makeSpecialUrl("Recentchangeslinked/$this->thispage") |
| | 832 | + 'href' => $rclTitle->getLocalUrl( 'target=' . urlencode( $this->thispage ) ) |
| 831 | 833 | ); |
| 832 | 834 | } |
| 833 | 835 | if ($wgUseTrackbacks) |