Bug #5944 - error message when moving thread; merged from MOODLE_16_STABLE

diff --git a/mod/forum/rsslib.php b/mod/forum/rsslib.php
index fa3b26fd9770944a11e647ce86f650773ef7add9..ce2855a91ac7ab0593fddf7d0c216c84c5f1bbd9 100644 (file)
--- a/mod/forum/rsslib.php
+++ b/mod/forum/rsslib.php
@@ -85,7 +85,11 @@
         global $CFG;
         //return unlink("{$CFG->dataroot}/rss/{$modname}/{$forum->id}.xml");
         $rssfile = rss_file_name('forum', $forum);
-        return unlink($rssfile);
+        if (file_exists($rssfile)) {
+            return unlink($rssfile);
+        } else {
+            return true;
+        }
     }