MDL-24224 moving forum attachments stored in incorrect area

diff --git a/mod/forum/db/upgrade.php b/mod/forum/db/upgrade.php
index ea0c833..23f5c9b 100644 (file)
--- a/mod/forum/db/upgrade.php
+++ b/mod/forum/db/upgrade.php
@@ -298,6 +298,23 @@ function xmldb_forum_upgrade($oldversion) {
         upgrade_mod_savepoint(true, 2010070800, 'forum');
     }
 
+    if ($oldversion < 2010091900) {
+        // rename files from borked upgrade in 2.0dev
+        $fs = get_file_storage();
+        $rs = $DB->get_recordset('files', array('component'=>'mod_form'));
+        foreach ($rs as $oldrecord) {
+            $file = $fs->get_file_instance($oldrecord);
+            $newrecord = array('component'=>'mod_forum');
+            if (!$fs->file_exists($oldrecord->contextid, 'mod_forum', $oldrecord->filearea, $oldrecord->itemid, $oldrecord->filepath, $oldrecord->filename)) {
+                $fs->create_file_from_storedfile($newrecord, $file);
+            }
+            $file->delete();
+        }
+        $rs->close();
+        upgrade_mod_savepoint(true, 2010091900, 'forum');
+    }
+
+
     return true;
 }
 

diff --git a/mod/forum/version.php b/mod/forum/version.php
index 0c60b3a..207c4f3 100644 (file)
--- a/mod/forum/version.php
+++ b/mod/forum/version.php
@@ -24,8 +24,8 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$module->version  = 2010082600;
-$module->requires = 2010082600;  // Requires this Moodle version
+$module->version  = 2010091900;
+$module->requires = 2010091900;  // Requires this Moodle version
 $module->cron     = 60;
 
 

diff --git a/version.php b/version.php
index bec22e3..7f8d385 100644 (file)
--- a/version.php
+++ b/version.php
@@ -29,7 +29,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$version = 2010091700;  // YYYYMMDD   = date of the last version bump
+$version = 2010091900;  // YYYYMMDD   = date of the last version bump
                         //         XX = daily increments
 
 $release = '2.0 Preview 4+ (Build: 20100919)';  // Human-friendly version name