From 68a59e7d38c3751e02faa5dad277c221a064eaee Mon Sep 17 00:00:00 2001
From: Frederic Massart <fred@moodle.com>
Date: Fri, 5 Dec 2014 15:31:42 +0800
Subject: [PATCH] MDL-48496 block_rss_client: Do not display curl error
 messages

---
 blocks/rss_client/block_rss_client.php         | 5 ++---
 blocks/rss_client/editfeed.php                 | 2 +-
 blocks/rss_client/lang/en/block_rss_client.php | 1 +
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/blocks/rss_client/block_rss_client.php b/blocks/rss_client/block_rss_client.php
index ed070a7..549030b 100644
--- a/blocks/rss_client/block_rss_client.php
+++ b/blocks/rss_client/block_rss_client.php
@@ -143,7 +143,7 @@
             $feed->set_cache_duration($CFG->block_rss_client_timeout*60);
         }
 
-        if(debugging() && $feed->error()){
+        if ($CFG->debugdeveloper && $feed->error()) {
             return '<p>'. $feedrecord->url .' Failed with code: '.$feed->error().'</p>';
         }
 
@@ -315,8 +315,7 @@
             $feed->init();
 
             if ($feed->error()) {
-                mtrace ('error');
-                mtrace ('SimplePie failed with error:'.$feed->error());
+                mtrace('Error: could not load/find the RSS feed');
                 $status = false;
             } else {
                 mtrace ('ok');
diff --git a/blocks/rss_client/editfeed.php b/blocks/rss_client/editfeed.php
index 482d1f7..1901e69 100644
--- a/blocks/rss_client/editfeed.php
+++ b/blocks/rss_client/editfeed.php
@@ -90,7 +90,7 @@ class feed_edit_form extends moodleform {
         $rss->init();
 
         if ($rss->error()) {
-            $errors['url'] = get_string('errorloadingfeed', 'block_rss_client', $rss->error());
+            $errors['url'] = get_string('couldnotfindloadrssfeed', 'block_rss_client');
         } else {
             $this->title = $rss->get_title();
             $this->description = $rss->get_description();
diff --git a/blocks/rss_client/lang/en/block_rss_client.php b/blocks/rss_client/lang/en/block_rss_client.php
index 7b10e4c..7fbfc11 100644
--- a/blocks/rss_client/lang/en/block_rss_client.php
+++ b/blocks/rss_client/lang/en/block_rss_client.php
@@ -34,6 +34,7 @@ $string['clientshowchannellinklabel'] = 'Should a link to the original site (cha
 $string['clientshowimagelabel'] = 'Show channel image if available :';
 $string['configblock'] = 'Configure this block';
 $string['couldnotfindfeed'] = 'Could not find feed with id';
+$string['couldnotfindloadrssfeed'] = 'Could not find or load the RSS feed.';
 $string['customtitlelabel'] = 'Custom title (leave blank to use title supplied by feed):';
 $string['deletefeedconfirm'] = 'Are you sure you want to delete this feed?';
 $string['disabledrssfeeds'] = 'RSS feeds are disabled';
-- 
1.9.1