From: Nick Jenkins <nickj@users.mediawiki.org>
Date: Mon, 29 Jan 2007 04:52:59 +0000 (+0000)
Subject: Prevent - Strict Standards: Non-static method ImportStreamSource::newFromFile() shoul... 
X-Git-Tag: 1.31.0-rc.0~54172
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/recherche.php?a=commitdiff_plain;h=4db0cc932148ffdce836506994cde04f3c6e5b5f;p=lhc%2Fweb%2Fwiklou.git

Prevent - Strict Standards: Non-static method ImportStreamSource::newFromFile() should not be called statically in includes/SpecialImport.php on line 826 ; Also indentation of one line.
---

diff --git a/includes/SpecialImport.php b/includes/SpecialImport.php
index d36757fe2c..10ab239628 100644
--- a/includes/SpecialImport.php
+++ b/includes/SpecialImport.php
@@ -804,7 +804,7 @@ class ImportStreamSource {
 		return fread( $this->mHandle, 32768 );
 	}
 
-	function newFromFile( $filename ) {
+	static function newFromFile( $filename ) {
 		$file = @fopen( $filename, 'rt' );
 		if( !$file ) {
 			return new WikiErrorMsg( "importcantopen" );
diff --git a/includes/SpecialPage.php b/includes/SpecialPage.php
index ce57a5b4db..6684f54b10 100644
--- a/includes/SpecialPage.php
+++ b/includes/SpecialPage.php
@@ -107,7 +107,7 @@ class SpecialPage
 		'Newpages'                  => array( 'IncludableSpecialPage', 'Newpages' ),
 		'Ancientpages'              => array( 'SpecialPage', 'Ancientpages' ),
 		'Deadendpages'              => array( 'SpecialPage', 'Deadendpages' ),
-		'Protectedpages'	    => array( 'SpecialPage', 'Protectedpages' ),
+		'Protectedpages'	        => array( 'SpecialPage', 'Protectedpages' ),
 		'Allpages'                  => array( 'IncludableSpecialPage', 'Allpages' ),
 		'Prefixindex'               => array( 'IncludableSpecialPage', 'Prefixindex' ) ,
 		'Ipblocklist'               => array( 'SpecialPage', 'Ipblocklist' ),