L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-34607-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

Browse Source
This commit is contained in:
Sam Hemelryk
2012-09-25 09:52:00 +12:00
parent fd0758da1b 7ae2136b3f
commit 8a7cc012fd
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/db/upgrade.php
+10
View File
@@ -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;
}
lib/filestorage/file_storage.php
+1 -1
View File
@@ -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()) {