[spalenque] - #12841 * fix bug in speaker merge

Author: santipalenque

summit/code/extensions/AttendeeMember.php

@@ -36,14 +36,19 @@ public function isAttendee($summit_id = null)
      */
     public function getSummitAttendee($summit_id = null)
     {
-        $attendee = $this->owner->SummitAttendance();
-        if (!is_null($summit_id)) {
-            $attendee = $attendee->filter(array
-            (
-                'SummitID' => $summit_id
-            ));
+        $attendees = $this->owner->SummitAttendance();
+        if ($attendees->Count() > 0) {
+            if (!is_null($summit_id)) {
+                $summit_attendees = $attendees->filter('SummitID', $summit_id);
+                $attendee = $summit_attendees->first();
+            } else {
+                $attendee = $attendees->first();
+            }
+
+            return $attendee;
+        } else {
+            return null;
         }
-        return $attendee->first();
     }
 
     /**

summit/code/interfaces/restfull_api/SummitAppSpeakersApi.php

@@ -192,7 +192,7 @@ public function getSpeakerByID(SS_HTTPRequest $request){
             $summit       = Summit::get_by_id('Summit',$summit_id);
             if(is_null($summit)) throw new NotFoundEntityException('Summit', sprintf(' id %s', $summit_id));
 
-            $speaker = PresentationSpeaker::get_by_id('PresentationSpeaker',$speaker_id);
+            $speaker = PresentationSpeaker::get()->byID($speaker_id);
             $attendee = ($speaker->Member()) ? $speaker->Member()->getCurrentSummitAttendee() : null;
 
             $speaker_array = array(