From 222b01f5169f1c7e69762e0e8904c24f78f71882 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Wed, 28 Jul 2010 11:52:48 +0200
Subject: update to MediaWiki 1.16.0

---
 includes/ExternalStoreHttp.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'includes/ExternalStoreHttp.php')

diff --git a/includes/ExternalStoreHttp.php b/includes/ExternalStoreHttp.php
index 6eb33b39..092ff7d8 100644
--- a/includes/ExternalStoreHttp.php
+++ b/includes/ExternalStoreHttp.php
@@ -1,15 +1,21 @@
 <?php
+
 /**
- * Example class for HTTP accessable external objects
+ * Example class for HTTP accessable external objects.
+ * Only supports reading, not storing.
  *
  * @ingroup ExternalStorage
  */
 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 );
+
+	/**
+	 * Fetch data from given URL
+	 *
+	 * @param $url String: the URL
+	 * @return String: the content at $url
+	 */
+	function fetchFromURL( $url ) {
+		$ret = Http::get( $url );
 		return $ret;
 	}
 
-- 
cgit v1.2.3-54-g00ecf