From: stronk7 <stronk7>
Date: Wed, 26 May 2004 16:12:58 +0000 (+0000)
Subject: Now make_upload_directory() is used, avoiding dependencies to
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=bc706aeb5f2b726eeb2513482cfb4c989667d786;p=moodle.git

Now make_upload_directory() is used, avoiding dependencies to
backup/lib.php. I think that, gradually, I'll can modify the
backup/restore process to use this "core" function everywhere!!
Bug 1467.
(http://moodle.org/bugs/bug.php?op=show&bugid=1467)
---

diff --git a/admin/cron.php b/admin/cron.php
index a8d6a0cb37..10c5e9fa50 100644
--- a/admin/cron.php
+++ b/admin/cron.php
@@ -149,7 +149,6 @@
 
     if (!empty($CFG->enablerssfeeds)) {  //Defined in admin/variables page
         if (file_exists("$CFG->dirroot/rss/rsslib.php")) {
-            include_once("$CFG->dirroot/backup/lib.php");    // Unfortunately this is required
             include_once("$CFG->dirroot/rss/rsslib.php");
             echo "Running rssfeeds if required...\n";
             flush();
diff --git a/rss/rsslib.php b/rss/rsslib.php
index e9d82c542b..b6bb328791 100644
--- a/rss/rsslib.php
+++ b/rss/rsslib.php
@@ -92,15 +92,10 @@ function rss_save_file ($modname,$mod,$result) {
     
     $status = true;
 
-    $basedir = $CFG->dataroot."/rss";
-
-    //Check dataroot/rss exists
-    $status = check_dir_exists($basedir,true);
-
-    $basedir .= "/".$modname;
-
-    //Check dataroot/rrs/$modname exists
-    $status = check_dir_exists($basedir,true);
+    if (! $basedir = make_upload_directory ("rss/".$modname)) {
+        //Cannot be created, so error
+        $status = false;
+    }
 
     if ($status) {
         $file = $basedir .= "/".$mod->id.".xml";
@@ -108,6 +103,8 @@ function rss_save_file ($modname,$mod,$result) {
         if ($rss_file) {
             $status = fwrite ($rss_file,$result);
             fclose($rss_file);
+        } else {
+            $status = false;
         }
     }
     return $status;