From 83f8b304e2df5a0027cbade365d91c50ccd2e4ec Mon Sep 17 00:00:00 2001 From: poltawski Date: Fri, 19 Oct 2007 15:09:12 +0000 Subject: [PATCH] MDL-11766 Flickr/Youtube blocks don't respect http proxy vars Merged from MOODLE_19_STABLE --- blocks/tag_flickr/block_tag_flickr.php | 5 +++-- blocks/tag_youtube/block_tag_youtube.php | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/blocks/tag_flickr/block_tag_flickr.php b/blocks/tag_flickr/block_tag_flickr.php index 23a9eea810..a3e22544b7 100644 --- a/blocks/tag_flickr/block_tag_flickr.php +++ b/blocks/tag_flickr/block_tag_flickr.php @@ -1,6 +1,7 @@ -dirroot.'/tag/lib.php'); +require_once($CFG->libdir . '/filelib.php'); require_once($CFG->libdir . '/magpie/rss_cache.inc'); define('FLICKR_DEV_KEY', '4fddbdd7ff2376beec54d7f6afad425e'); @@ -127,7 +128,7 @@ class block_tag_flickr extends block_base { $cached_response = $cache->get( $request ); } - $response = file_get_contents($request); + $response = download_file_content($request); if(empty($response)){ $response = $cached_response; diff --git a/blocks/tag_youtube/block_tag_youtube.php b/blocks/tag_youtube/block_tag_youtube.php index 03cc2dcf86..1d74ad1afc 100644 --- a/blocks/tag_youtube/block_tag_youtube.php +++ b/blocks/tag_youtube/block_tag_youtube.php @@ -1,6 +1,7 @@ -dirroot.'/tag/lib.php'); +require_once($CFG->libdir . '/filelib.php'); require_once($CFG->libdir . '/magpie/rss_cache.inc'); require_once($CFG->libdir . '/phpxml/xml.php'); @@ -134,7 +135,7 @@ class block_tag_youtube extends block_base { $cached_response = $cache->get( $request ); } - $response = file_get_contents($request); + $response = download_file_content($request); if(empty($response)){ $response = $cached_response; -- 2.39.5