*Replace calls to $this->blockedIPpage() with $wgOut->blockedPage() since the former...

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index a7ee45c..4cf8730 100644 (file)
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -512,7 +512,8 @@ END
                        return;
                }
                if ( $wgUser->isBlocked() ) {
-                       return $this->blockedIPpage();
+                       $wgOut->blockedPage();
+                       return;
                }
                if ( wfReadOnly() ) {
                        $wgOut->readOnlyPage();
@@ -645,7 +646,8 @@ END
                        return;
                }
                if ( $wgUser->isBlocked() ) {
-                       return $this->blockedIPpage();
+                       $wgOut->blockedPage();
+                       return;
                }
                if( !$wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ), $oldimage ) ) {
                        $wgOut->showErrorPage( 'internalerror', 'sessionfailure' );
@@ -686,11 +688,6 @@ END
                $descTitle = $img->getTitle();
                $wgOut->returnToMain( false, $descTitle->getPrefixedText() );
        }
-
-       function blockedIPpage() {
-               $edit = new EditPage( $this );
-               return $edit->blockedIPpage();
-       }
        
        /**
         * Override handling of action=purge