From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Fri, 27 Jun 2008 11:43:39 +0000 (+0000)
Subject: Tweaks for r36682:
X-Git-Tag: 1.31.0-rc.0~46865
X-Git-Url: http://git.cyclocoop.org/data/Luca_Pacioli_%28Gemaelde%29.jpeg?a=commitdiff_plain;h=c51e64755460f45877f189ff697806a1de1a7e23;p=lhc%2Fweb%2Fwiklou.git

Tweaks for r36682:
* output an error if an invalid title was given
* Don't allow interwiki links
* Removed unused global definition of $wgContLang in SpecialRecentchanges::makeOptionsLink()
---

diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php
index 01b290927f..535dab2e98 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -571,11 +571,10 @@ class SpecialRecentChanges extends SpecialPage {
 	 * @param $options
 	 */
 	function makeOptionsLink( $title, $override, $options, $active = false ) {
-		global $wgUser, $wgContLang;
+		global $wgUser;
 		$sk = $wgUser->getSkin();
-		return $sk->makeKnownLinkObj( $this->getTitle(),
-			htmlspecialchars( $title ), wfArrayToCGI( $override, $options ), '', '',
-			$active ? 'style="font-weight: bold;"' : '' );
+		return $sk->makeKnownLinkObj( $this->getTitle(), htmlspecialchars( $title ),
+			wfArrayToCGI( $override, $options ), '', '', $active ? 'style="font-weight: bold;"' : '' );
 	}
 
 	/**
diff --git a/includes/specials/SpecialRecentchangeslinked.php b/includes/specials/SpecialRecentchangeslinked.php
index fca94c7ddc..2b00ef3f8f 100644
--- a/includes/specials/SpecialRecentchangeslinked.php
+++ b/includes/specials/SpecialRecentchangeslinked.php
@@ -40,23 +40,23 @@ class SpecialRecentchangeslinked extends SpecialRecentchanges {
 	public function doMainQuery( $conds, $opts ) {
 		global $wgUser, $wgOut;
 
-		$title = Title::newFromURL( $opts['target'] );
+		$target = $opts['target'];
 		$showlinkedto = $opts['showlinkedto'];
 		$limit = $opts['limit'];
 
-		$target = $title ? $title->getPrefixedText() : '';
 		if ( $target === '' ) {
 			return false;
 		}
-		if( !$title ){
+		$title = Title::newFromURL( $target );
+		if( !$title || $title->getInterwiki() != '' ){
 			global $wgOut;
-			$wgOut->showErrorPage( 'notargettitle', 'notargettext' );
+			$wgOut->wrapWikiMsg( '<div class="errorbox">$1</div><br clear="both" />', 'allpagesbadtitle' );
 			return false;
 		}
-
-		$wgOut->setPageTitle( wfMsg( 'recentchangeslinked-title', $target ) );
 		$this->mTargetTitle = $title;
 
+		$wgOut->setPageTitle( wfMsg( 'recentchangeslinked-title', $title->getPrefixedText() ) );
+
 		$dbr = wfGetDB( DB_SLAVE, 'recentchangeslinked' );
 		$id = $title->getArticleId();
 
@@ -118,10 +118,10 @@ class SpecialRecentchangeslinked extends SpecialRecentchanges {
 	function setTopText( &$out, $opts ){}
 	
 	function setBottomText( &$out, $opts ){
-		if( $target = $opts['target'] ){
+		if( isset( $this->mTargetTitle ) && is_object( $this->mTargetTitle ) ){
 			global $wgUser;
-			$out->setFeedAppendQuery( "target=" . urlencode( $target ) );
-			$out->addHTML("&lt; ".$wgUser->getSkin()->makeLinkObj( Title::newFromUrl( $target ), "", "redirect=no" )."<hr />\n");
+			$out->setFeedAppendQuery( "target=" . urlencode( $this->mTargetTitle->getPrefixedDBkey() ) );
+			$out->addHTML("&lt; ".$wgUser->getSkin()->makeLinkObj( $this->mTargetTitle, "", "redirect=no" )."<hr />\n");
 		}
 		if( isset( $this->mResultEmpty ) && $this->mResultEmpty ){
 			$out->addWikiMsg( 'recentchangeslinked-noresult' );