* (bug 21679) "Edit block reasons" link at the bottom of Special:Blockip is now only...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 98e56ae..a87e6a0 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -650,6 +650,8 @@ Hopefully we will remove this configuration var soon)
   PHP's memcached extension
 * (bug 21650) Both calls to SkinTemplateTabs hook are now compatible
 * (bug 21672) Add missing Accept-Language to both Vary and XVO headers
+* (bug 21679) "Edit block reasons" link at the bottom of Special:Blockip is now
+  only displayed to the users that have "editinterface" right
 
 == API changes in 1.16 ==
 

diff --git a/includes/specials/SpecialBlockip.php b/includes/specials/SpecialBlockip.php
index 276f77a..c3e5dcc 100644 (file)
--- a/includes/specials/SpecialBlockip.php
+++ b/includes/specials/SpecialBlockip.php
@@ -696,13 +696,15 @@ class IPBlockForm {
                        $links[] = $this->getContribsLink( $skin );
                $links[] = $this->getUnblockLink( $skin );
                $links[] = $this->getBlockListLink( $skin );
-               $title = Title::makeTitle( NS_MEDIAWIKI, 'Ipbreason-dropdown' );
-               $links[] = $skin->link(
-                       $title,
-                       wfMsgHtml( 'ipb-edit-dropdown' ),
-                       array(),
-                       array( 'action' => 'edit' )
-               );
+               if ( $wgUser->isAllowed( 'editinterface' ) ) {
+                       $title = Title::makeTitle( NS_MEDIAWIKI, 'Ipbreason-dropdown' );
+                       $links[] = $skin->link(
+                               $title,
+                               wfMsgHtml( 'ipb-edit-dropdown' ),
+                               array(),
+                               array( 'action' => 'edit' )
+                       );
+               }
                return '<p class="mw-ipb-conveniencelinks">' . $wgLang->pipeList( $links ) . '</p>';
        }