From: Chad Horohoe <demon@users.mediawiki.org>
Date: Tue, 21 Oct 2008 00:04:33 +0000 (+0000)
Subject: (bug 2508) Don't show edit button if user is blocked, show 'viewsource' instead.
X-Git-Tag: 1.31.0-rc.0~44664
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=0d901b87afbb986a54afeae5e992f4aac7d04ee1;p=lhc%2Fweb%2Fwiklou.git

(bug 2508) Don't show edit button if user is blocked, show 'viewsource' instead.
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 08902a927c..1f906041e1 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -276,6 +276,7 @@ The following extensions are migrated into MediaWiki 1.14:
 * (bug 15605) Enabled $datePreferences for language 'hr'. Added standard date
   preferences.
 * (bug 13701) {{NUMBEROFVIEWS}} magic word to show number of total views.
+* (bug 2508) Don't show edit button if user is blocked from editing
 
 === API changes in 1.14 ===
 
diff --git a/includes/Skin.php b/includes/Skin.php
index b1336ee8c6..3cdccf7479 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1448,14 +1448,14 @@ END;
 	}
 
 	function editThisPage() {
-		global $wgOut, $wgTitle;
+		global $wgOut, $wgTitle, $wgUser;
 
 		if ( !$wgOut->isArticleRelated() ) {
 			$s = wfMsg( 'protectedpage' );
 		} else {
-			if( $wgTitle->quickUserCan( 'edit' ) && $wgTitle->exists() ) {
+			if( $wgTitle->quickUserCan( 'edit' ) && $wgTitle->exists() && !$wgUser->isBlocked() ) {
 				$t = wfMsg( 'editthispage' );
-			} elseif( $wgTitle->quickUserCan( 'create' ) && !$wgTitle->exists() ) {
+			} elseif( $wgTitle->quickUserCan( 'create' ) && !$wgTitle->exists() && !$wgUser->isBlocked() ) {
 				$t = wfMsg( 'create-this-page' );
 			} else {
 				$t = wfMsg( 'viewsource' );