MDL-11766 Flickr/Youtube blocks don't respect http proxy vars

Merged from MOODLE_19_STABLE
This commit is contained in:
poltawski
2007-10-19 15:09:12 +00:00
parent 08ec989fd0
commit 83f8b304e2
2 changed files with 6 additions and 4 deletions
+3 -2
View File
@@ -1,6 +1,7 @@
<?php
<?php // $id$
require_once($CFG->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;
+3 -2
View File
@@ -1,6 +1,7 @@
<?php
<?php // $id$
require_once($CFG->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;