From: moodler <moodler>
Date: Wed, 5 Apr 2006 02:43:41 +0000 (+0000)
Subject: Fix for sites not using proxies
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=a9924bb134724b20bf40c852f38c9ff4e5017716;p=moodle.git

Fix for sites not using proxies
---

diff --git a/lib/rsslib.php b/lib/rsslib.php
index 2fb8176c72..e0d82d9218 100644
--- a/lib/rsslib.php
+++ b/lib/rsslib.php
@@ -347,11 +347,8 @@ if (!isset($CFG->block_rss_timeout) ) {
 }
 
 // Defines for moodle's use of magpierss classes
- // Defines for moodle's use of magpierss classes
-if(isset($CFG->proxyhost) && $CFG->proxyhost) {
-  define('MAGPIE_PROXY_HOST', $CFG->proxyhost);
-  define('MAGPIE_PROXY_PORT', $CFG->proxyport);
-}
+define('MAGPIE_PROXY_HOST', $CFG->proxyhost);   // Could be empty, that's OK
+define('MAGPIE_PROXY_PORT', $CFG->proxyport);   // Could be empty, that's OK
 define('MAGPIE_DIR', $CFG->dirroot.'/lib/magpie/');
 define('MAGPIE_CACHE_DIR', $CFG->dataroot .'/cache/rsscache');
 define('MAGPIE_CACHE_ON', true); //might want to expose as an admin config option, but perhaps this is something that should truly just be on unless the code is tweaked