Merge branch 'MDL-66796-36-fix' of https://github.com/snake/moodle into MOODLE_36_STABLE

question/category_class.php

@@ -437,6 +437,7 @@ class question_category_object {
         $cat->sortorder = 999;
         $cat->stamp = make_unique_id_code();
         $cat->idnumber = $idnumber;
+
         $categoryid = $DB->insert_record("question_categories", $cat);
 
         // Log the creation of this category.
@@ -491,6 +492,7 @@ class question_category_object {
             }
         }
 
+        $updateidnumber = true;
         if ((string) $idnumber === '') {
             $idnumber = null;
         } else if (!empty($tocontextid)) {
@@ -498,6 +500,7 @@ class question_category_object {
             if ($DB->record_exists('question_categories',
                     ['idnumber' => $idnumber, 'contextid' => $tocontextid])) {
                 $idnumber = null;
+                $updateidnumber = false;
             }
         }
 
@@ -509,7 +512,9 @@ class question_category_object {
         $cat->infoformat = $newinfoformat;
         $cat->parent = $parentid;
         $cat->contextid = $tocontextid;
-        $cat->idnumber = $idnumber;
+        if ($updateidnumber) {
+            $cat->idnumber = $idnumber;
+        }
         if ($newstamprequired) {
             $cat->stamp = make_unique_id_code();
         }