Revert previous commit, breaks cache.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 1f90604..08902a9 100644 (file)
--- 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 3cdccf7..b1336ee 100644 (file)
--- 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' );