From 94afadb36038e2c10e186f32821dac39bc2b2f7b Mon Sep 17 00:00:00 2001 From: martinlanghoff Date: Tue, 1 Feb 2005 01:37:14 +0000 Subject: [PATCH] Merged from MOODLE_14_HEAD - Better behaviour of fix_course_sortorder() -- related to bug #2334 --- lib/datalib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/datalib.php b/lib/datalib.php index 292fbcb855..4f848b127c 100644 --- a/lib/datalib.php +++ b/lib/datalib.php @@ -2402,7 +2402,7 @@ function fix_course_sortorder($categoryid=0, $n=0, $safe=0) { $n = $n + $catgap; // if the new sequence overlaps the current sequence, lack of transactions // will stop us -- shift things aside for a moment... - if ($n >= $min && $n+$count+1 < $min && $CFG->dbtype==='mysql') { + if ($safe || ($n >= $min && $n+$count+1 < $min && $CFG->dbtype==='mysql')) { $shift = $n + $count + 100; execute_sql("UPDATE {$CFG->prefix}course SET sortorder=sortorder+$shift @@ -2427,7 +2427,7 @@ function fix_course_sortorder($categoryid=0, $n=0, $safe=0) { if ($categories = get_categories($categoryid)) { foreach ($categories as $category) { - $n = fix_course_sortorder($category->id, $n); + $n = fix_course_sortorder($category->id, $n, $safe); } } -- 2.39.5