From 7ae2136b3fc1bd575cac7dd7a5b3dc69e216488c Mon Sep 17 00:00:00 2001
From: Frederic Massart <fred@moodle.com>
Date: Mon, 17 Sep 2012 17:02:30 +0800
Subject: [PATCH] MDL-34607 Folder: Remove any sort order during upgrade

---
 lib/db/upgrade.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 97f3fb27f46..386792cfd0d 100644
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -959,5 +959,15 @@ function xmldb_main_upgrade($oldversion) {
         upgrade_main_savepoint(true, 2012062501.14);
     }
 
+    if ($oldversion < 2012062502.02) {
+        // Some folders still have a sortorder set, which is used for main files but is not
+        // supported by the folder resource. We reset the value here.
+        $sql = 'UPDATE {files} SET sortorder = ? WHERE component = ? AND filearea = ? AND sortorder <> ?';
+        $DB->execute($sql, array(0, 'mod_folder', 'content', 0));
+
+        // Main savepoint reached.
+        upgrade_main_savepoint(true, 2012062502.02);
+    }
+
     return true;
 }