From 4db0cc932148ffdce836506994cde04f3c6e5b5f Mon Sep 17 00:00:00 2001 From: Nick Jenkins Date: Mon, 29 Jan 2007 04:52:59 +0000 Subject: [PATCH] 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. --- includes/SpecialImport.php | 2 +- includes/SpecialPage.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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' ), -- 2.20.1