From: Rob Church <robchurch@users.mediawiki.org>
Date: Sun, 14 Jan 2007 22:00:51 +0000 (+0000)
Subject: * (bug 8522) Provide a "delete" link on Special:Brokenredirects for users with  the... 
X-Git-Tag: 1.31.0-rc.0~54401
X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_del%27%2C%20idvote=vote.voteid%29%20%7D%7D?a=commitdiff_plain;h=217c908a89a61c9a125813cc37e342b3ec7a788f;p=lhc%2Fweb%2Fwiklou.git

* (bug 8522) Provide a "delete" link on Special:Brokenredirects for users with  the appropriate permission
* Use Skin::makeKnownLinkObj() and "action=edit" to make the redirect editing link, instead of Skin::makeBrokenLinkObj() - it looks nicer
* Use a separate message, "brokenlinks-edit", for the edit link label, and fix escaping
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b74d0cfed8..ee949ff4bb 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -69,6 +69,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 7842) Link back to deleted revision list from deleted revision preview
 * (bug 8619) Add user-aware "unblock" link to Special:Blockip
 * (bug 8407) Disallow indexing of "printable" versions
+* (bug 8522) Provide a "delete" link on Special:Brokenredirects for users with
+  the appropriate permission
 
 == Languages updated ==
 
diff --git a/includes/SpecialBrokenRedirects.php b/includes/SpecialBrokenRedirects.php
index 509356540c..398addd417 100644
--- a/includes/SpecialBrokenRedirects.php
+++ b/includes/SpecialBrokenRedirects.php
@@ -46,7 +46,7 @@ class BrokenRedirectsPage extends PageQueryPage {
 	}
 
 	function formatResult( $skin, $result ) {
-		global $wgContLang;
+		global $wgUser, $wgContLang;
 		
 		$fromObj = Title::makeTitle( $result->namespace, $result->title );
 		if ( isset( $result->pl_title ) ) {
@@ -66,11 +66,19 @@ class BrokenRedirectsPage extends PageQueryPage {
 		}
 
 		$from = $skin->makeKnownLinkObj( $fromObj ,'', 'redirect=no' );
-		$edit = $skin->makeBrokenLinkObj( $fromObj , "(".wfMsg("qbedit").")" , 'redirect=no');
+		$edit = $skin->makeKnownLinkObj( $fromObj, wfMsgHtml( 'brokenredirects-edit' ), 'action=edit&redirect=no' );
 		$to   = $skin->makeBrokenLinkObj( $toObj );
 		$arr = $wgContLang->getArrow();
-
-		return "$from $edit $arr $to";
+		
+		$out = "{$from} {$edit}";
+		
+		if( $wgUser->isAllowed( 'delete' ) ) {
+			$delete = $skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'delete' ), wfMsgHtml( 'brokenredirects-delete' ) );
+			$out .= " {$delete}";
+		}
+		
+		$out .= " {$arr} {$to}";
+		return $out;
 	}
 }
 
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 92a72f4a75..0bc4ba83fa 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1458,7 +1458,8 @@ The [http://meta.wikimedia.org/wiki/Help:Job_queue job queue] length is '''$7'''
 'brokenredirects'	=> 'Broken redirects',
 'brokenredirects-summary'	=> '',
 'brokenredirectstext'	=> 'The following redirects link to non-existent pages:',
-
+'brokenredirects-edit' => '(edit)',
+'brokenredirects-delete' => '(delete)',
 
 # Miscellaneous special pages
 #