From 80b6f716dc220dd1a6de39bec38a3a3ffeb0d0db Mon Sep 17 00:00:00 2001
From: Frederic Massart <fred@moodle.com>
Date: Fri, 5 Dec 2014 15:31:42 +0800
Subject: [PATCH 1/2] 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 30b623c..27b771d 100644
--- a/blocks/rss_client/block_rss_client.php
+++ b/blocks/rss_client/block_rss_client.php
@@ -142,7 +142,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>';
         }
 
@@ -314,8 +314,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 a0193af..77e3097 100644
--- a/blocks/rss_client/editfeed.php
+++ b/blocks/rss_client/editfeed.php
@@ -89,7 +89,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 cb2db5c..df888ce 100644
--- a/blocks/rss_client/lang/en/block_rss_client.php
+++ b/blocks/rss_client/lang/en/block_rss_client.php
@@ -33,6 +33,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


From dd22f43421c5e9a1ae3db5b363aeab54a1672433 Mon Sep 17 00:00:00 2001
From: Frederic Massart <fred@moodle.com>
Date: Fri, 5 Dec 2014 15:33:17 +0800
Subject: [PATCH 2/2] MDL-48496 block_rss_client: Deleting unused string
 errorloadingfeed

---
 blocks/rss_client/lang/en/block_rss_client.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/blocks/rss_client/lang/en/block_rss_client.php b/blocks/rss_client/lang/en/block_rss_client.php
index df888ce..cdd8291 100644
--- a/blocks/rss_client/lang/en/block_rss_client.php
+++ b/blocks/rss_client/lang/en/block_rss_client.php
@@ -44,7 +44,6 @@ $string['editnewsfeeds'] = 'Edit news feeds';
 $string['editrssblock'] = 'Edit RSS headline block';
 $string['enableautodiscovery'] = 'Enable auto-discovery of feeds?';
 $string['enableautodiscovery_help'] = 'If enabled, feeds on web pages are found automatically. For example, if http://docs.moodle.org is entered, then http://docs.moodle.org/en/index.php?title=Special:RecentChanges&feed=rss would be found.';
-$string['errorloadingfeed'] = 'Error loading this RSS feed ({$a})';
 $string['feed'] = 'Feed';
 $string['feedadded'] = 'News feed added';
 $string['feeddeleted'] = 'News feed deleted';
-- 
1.9.1