From dfd5bc8d7ce1feac4b1f678f2eaddf4cd56237af Mon Sep 17 00:00:00 2001
From: Yannick Warnier <ywarnier@beeznest.org>
Date: Wed, 28 Aug 2019 17:56:12 +0200
Subject: [PATCH] Fix issue linking external career names in automated CSV
 import of calendar events (2/2) - refs BT#15628

---
 main/cron/import_csv.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/main/cron/import_csv.php b/main/cron/import_csv.php
index 9921f94004..3dec5776a7 100755
--- a/main/cron/import_csv.php
+++ b/main/cron/import_csv.php
@@ -1436,18 +1436,21 @@ class ImportCsv
                         $event['session_id'],
                         'careerid'
                     );
-                    $externalCareerId = substr($externalCareerId, 1, -1);
+                    $externalCareerId = $externalCareerId['value'];
+                    if (substr($externalCareerId, 0, 1) === '[') {
+                        $externalCareerId = substr($externalCareerId, 1, -1);
+                    }
 
                     // Using the external_career_id field (from above),
                     // find the career ID
                     $careerExtraFieldValue = new ExtraFieldValue('career');
-                    $careerId = $careerExtraFieldValue->get_item_id_from_field_variable_and_field_value(
+                    $careerValue = $careerExtraFieldValue->get_item_id_from_field_variable_and_field_value(
                         'external_career_id',
                         $externalCareerId
                     );
 
                     $career = new Career();
-                    $career = $career->find($careerId);
+                    $career = $career->find($careerValue['item_id']);
                     $careerName = $career['name'];
 
                     $subject = sprintf(