Remove last of ini_set() for allow_url_fopen. This hasn't worked since PHP 4.3.4...

diff --git a/includes/ExternalStoreHttp.php b/includes/ExternalStoreHttp.php
index 6eb33b3..e813958 100644 (file)
--- a/includes/ExternalStoreHttp.php
+++ b/includes/ExternalStoreHttp.php
@@ -7,9 +7,7 @@
 class ExternalStoreHttp {
        /* Fetch data from given URL */
        function fetchFromURL($url) {
-               ini_set( "allow_url_fopen", true );
                $ret = file_get_contents( $url );
-               ini_set( "allow_url_fopen", false );
                return $ret;
        }
 

diff --git a/includes/WebStart.php b/includes/WebStart.php
index edc58cb..ffef7be 100644 (file)
--- a/includes/WebStart.php
+++ b/includes/WebStart.php
@@ -46,7 +46,6 @@ if ( function_exists ( 'getrusage' ) ) {
        $wgRUstart = array();
 }
 unset( $IP );
-@ini_set( 'allow_url_fopen', 0 ); # For security
 
 # Valid web server entry point, enable includes.
 # Please don't move this line to includes/Defines.php. This line essentially

diff --git a/includes/templates/PHP4.php b/includes/templates/PHP4.php
index 058351a..fb794a3 100644 (file)
--- a/includes/templates/PHP4.php
+++ b/includes/templates/PHP4.php
@@ -70,8 +70,7 @@ if ( $baseUrl ) {
        if( function_exists( 'file_get_contents' ) ) {
                $errorLevel = error_reporting();
                error_reporting( $errorLevel & !E_WARNING );
-               
-               ini_set( 'allow_url_fopen', '1' );
+
                $s = file_get_contents( $testUrl );
                
                error_reporting( $errorLevel );