From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Fri, 4 May 2007 19:17:36 +0000 (+0000)
Subject: *Replace calls to $this->blockedIPpage() with $wgOut->blockedPage() since the former... 
X-Git-Tag: 1.31.0-rc.0~53085
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/journal.php?a=commitdiff_plain;h=62c20a75639c15bd6c32c46c17c104b601445371;p=lhc%2Fweb%2Fwiklou.git

*Replace calls to $this->blockedIPpage() with $wgOut->blockedPage() since the former refers to a non-existent function in EditPage.
---

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index a7ee45c303..4cf8730eb6 100644
--- 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