From 7be6c09db583976c5402b8f21fe88774ebe72103 Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Mon, 17 Sep 2012 16:57:05 +0800 Subject: [PATCH 1/2] MDL-34607 File API: Removed ordering by sortorder in area tree --- lib/filestorage/file_storage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/filestorage/file_storage.php b/lib/filestorage/file_storage.php index 917705b4493..c34ebe69426 100644 --- a/lib/filestorage/file_storage.php +++ b/lib/filestorage/file_storage.php @@ -443,7 +443,7 @@ class file_storage { */ public function get_area_tree($contextid, $component, $filearea, $itemid) { $result = array('dirname'=>'', 'dirfile'=>null, 'subdirs'=>array(), 'files'=>array()); - $files = $this->get_area_files($contextid, $component, $filearea, $itemid, "sortorder, itemid, filepath, filename", true); + $files = $this->get_area_files($contextid, $component, $filearea, $itemid, "itemid, filepath, filename", true); // first create directory structure foreach ($files as $hash=>$dir) { if (!$dir->is_directory()) { From 7ae2136b3fc1bd575cac7dd7a5b3dc69e216488c Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Mon, 17 Sep 2012 17:02:30 +0800 Subject: [PATCH 2/2] 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; }