Additional fixes to last merge.

[fa-stable.git] / gl / includes / db / gl_db_rates.inc

diff --git a/gl/includes/db/gl_db_rates.inc b/gl/includes/db/gl_db_rates.inc
index b91e909a3146a0e7df5a2c39d749460095253d2b..5d98dcb7afd166084b4214e1901d771d1a1078a9 100644 (file)
--- a/gl/includes/db/gl_db_rates.inc
+++ b/gl/includes/db/gl_db_rates.inc
@@ -112,7 +112,9 @@ function get_extern_rate($curr_b, $provider = 'ECB', $date)
               curl_setopt ($ch, CURLOPT_COOKIEJAR, "cookie.txt");
           curl_setopt ($ch, CURLOPT_HEADER, 0);
               curl_setopt ($ch, CURLOPT_RETURNTRANSFER, 1);
-          curl_setopt ($ch, CURLOPT_FOLLOWLOCATION, 1);
+              // prevent warning while save_mode/open_basedir on (redireciton doesn't occur at least on ECB page)
+                  if (!ini_get('save_mode') && !ini_get('open_basedir'))
+               curl_setopt ($ch, CURLOPT_FOLLOWLOCATION, 1);
               curl_setopt ($ch, CURLOPT_TIMEOUT, 3);
           $contents = curl_exec ($ch);
               curl_close($ch);
@@ -125,7 +127,7 @@ function get_extern_rate($curr_b, $provider = 'ECB', $date)
                $contents = url_get_contents("http://".$site.$filename);
        }
        if (!$contents) {
-               display_warning(_("Cannot retrieve currency rate from $provider page. Please set the rate manually."));
+               display_warning(sprintf(_("Cannot retrieve currency rate from %s page. Please set the rate manually."), $provider));
        }
        if ($provider == 'ECB')
        {