From 71a5520ec8a1873758027275ad0b2b90aeb22ede Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Tue, 21 Oct 2008 00:26:28 +0000 Subject: [PATCH] Revert previous commit, breaks cache. --- RELEASE-NOTES | 1 - includes/Skin.php | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 1f906041e1..08902a927c 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -276,7 +276,6 @@ 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 3cdccf7479..b1336ee8c6 100644 --- a/includes/Skin.php +++ b/includes/Skin.php @@ -1448,14 +1448,14 @@ END; } function editThisPage() { - global $wgOut, $wgTitle, $wgUser; + global $wgOut, $wgTitle; if ( !$wgOut->isArticleRelated() ) { $s = wfMsg( 'protectedpage' ); } else { - if( $wgTitle->quickUserCan( 'edit' ) && $wgTitle->exists() && !$wgUser->isBlocked() ) { + if( $wgTitle->quickUserCan( 'edit' ) && $wgTitle->exists() ) { $t = wfMsg( 'editthispage' ); - } elseif( $wgTitle->quickUserCan( 'create' ) && !$wgTitle->exists() && !$wgUser->isBlocked() ) { + } elseif( $wgTitle->quickUserCan( 'create' ) && !$wgTitle->exists() ) { $t = wfMsg( 'create-this-page' ); } else { $t = wfMsg( 'viewsource' ); -- 2.20.1