From 25a237a24dc214072a5fbc6af021eaeab33a9234 Mon Sep 17 00:00:00 2001
From: skodak <skodak>
Date: Wed, 8 Oct 2008 19:09:43 +0000
Subject: [PATCH] =?UTF-8?q?MDL-16738=20fixed=20+=20array=20operator=20over?=
 =?UTF-8?q?riding=20the=20same=20numeric=20keys=20-=20credit=20goes=20to?=
 =?UTF-8?q?=20Vince=20G=C3=A1ng=C3=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 calendar/export_execute.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/calendar/export_execute.php b/calendar/export_execute.php
index 6d07865ec98..e358c9e7290 100644
--- a/calendar/export_execute.php
+++ b/calendar/export_execute.php
@@ -37,7 +37,7 @@ if(!empty($what) && !empty($time)) {
             foreach ($courses as $course) {
                 $course_groups = groups_get_all_groups($course->id, $user->id);
                 if ($course_groups) {
-                    $groups = $groups + array_keys($course_groups);
+                    $groups = array_merge($groups, array_keys($course_groups));
                 }
             }
             if (empty($groups)) {