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

Merge branch 'w24_MDL-33204_m23_importsort' of git://github.com/skodak/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2012-06-13 18:01:31 +02:00
parent f7b3e092e9 f327b9c3f3
commit 3f2939fa3e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/book/tool/importhtml/locallib.php
+5 -5
View File
@@ -298,10 +298,10 @@ function toolbook_importhtml_get_chapter_files($package, $type) {
}
}
}
// TODO: natural dir sorting would be nice here...
textlib::asort($tophtmlfiles);
textlib::asort($subhtmlfiles);
textlib::asort($topdirs);
collatorlib::ksort($tophtmlfiles, collatorlib::SORT_NATURAL);
collatorlib::ksort($subhtmlfiles, collatorlib::SORT_NATURAL);
collatorlib::ksort($topdirs, collatorlib::SORT_NATURAL);
$chapterfiles = array();
@@ -313,7 +313,7 @@ function toolbook_importhtml_get_chapter_files($package, $type) {
if (empty($htmlfiles)) {
continue;
}
textlib::asort($htmlfiles);
collatorlib::ksort($htmlfiles, collatorlib::SORT_NATURAL);
if (isset($htmlfiles[$dir.'/index.html'])) {
$htmlfile = $htmlfiles[$dir.'/index.html'];
} else if (isset($htmlfiles[$dir.'/index.htm'])) {