Merge branch 'wip-86264-m39' into MOODLE_39_STABLE

# Conflicts: # local/o365/classes/feature/usergroups/coursegroups.php # local/o365/classes/feature/usergroups/utils.php
microsoft · Sep 29, 2022 · f57a6e5 · f57a6e5
2 parents 86d925b + 3617e05
commit f57a6e5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/local/o365/classes/feature/usergroups/coursegroups.php b/local/o365/classes/feature/usergroups/coursegroups.php
@@ -1488,8 +1488,8 @@ public function process_course_reset_group(\stdClass $course, \stdClass $o365obj
                     $resetgroupnameprefix);
                 $timestamp = '_' . time();
                 $exisinggroupmailnickname = \local_o365\feature\usergroups\utils::get_group_mail_alias($course);
-                if (strlen($timestamp) + strlen($exisinggroupmailnickname) >= 60) {
-                    $exisinggroupmailnickname = substr($exisinggroupmailnickname, 0, 60 - strlen($timestamp));
+                if (strlen($timestamp) + strlen($exisinggroupmailnickname) >= 59) {
+                    $exisinggroupmailnickname = substr($exisinggroupmailnickname, 0, 59 - strlen($timestamp));
                 }
                 $exisinggroupmailnickname .= $timestamp;
                 $updatedexistinggroup = [

diff --git a/local/o365/classes/feature/usergroups/utils.php b/local/o365/classes/feature/usergroups/utils.php
@@ -947,7 +947,7 @@ public static function get_group_mail_alias(\stdClass $course, \stdClass $group
 
         $coursepart = static::clean_up_group_mail_alias($coursepart);
 
-        $coursepartmaxlength = 60 - strlen($groupmailaliasprefix) - strlen($groupmailaliassuffix) - strlen($grouppart);
+        $coursepartmaxlength = 59 - strlen($groupmailaliasprefix) - strlen($groupmailaliassuffix) - strlen($grouppart);
         if (strlen($coursepart) > $coursepartmaxlength) {
             $coursepart = substr($coursepart, 0, $coursepartmaxlength);
         }