MDL-14027 cron sometimes hangs in rss_client block; merged from MOODLE_19_STABLE

diff --git a/blocks/rss_client/block_rss_client.php b/blocks/rss_client/block_rss_client.php
index 41e42aac276a9f0ac7333e2cf370d40cf2ef63de..c4f7527c85642d3bd637ddd24dfb5268f490a444 100644 (file)
--- a/blocks/rss_client/block_rss_client.php
+++ b/blocks/rss_client/block_rss_client.php
@@ -330,6 +330,9 @@
             mtrace('    ' . $rec->url . ' ', '');
         /// Fetch the rss feed, using standard magpie caching
         /// so feeds will be renewed only if cache has expired
+            // sometimes the cron times out on moodle.org during fetching,
+            // there is a 5s limit in magpie which should work, but does not sometimes :-(
+            @set_time_limit(60);
             if ($rss = fetch_rss($rec->url)) {
                 mtrace ('ok');
             } else {