X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FEvent.php;h=e65e61ee58367a4e3e6005217a36a5a29af1b860;hb=8564eeec4ed28697eac40a6f56e89ab9ef89144d;hp=978dce7cf67758ec83b4cebc42bcc0407bfb17bf;hpb=254974826f0fd139d74ed4fe18304dd7cad6213c;p=friendica.git

diff --git a/src/Model/Event.php b/src/Model/Event.php
index 978dce7cf6..e65e61ee58 100644
--- a/src/Model/Event.php
+++ b/src/Model/Event.php
@@ -287,7 +287,7 @@ class Event extends BaseObject
 				'nofinish' => $event['nofinish'],
 			];
 
-			dba::update('event', $updated_fields, ['id' => $event['cid'], 'uid' => $event['uid']]);
+			dba::update('event', $updated_fields, ['id' => $event['id'], 'uid' => $event['uid']]);
 
 			$item = dba::selectFirst('item', ['id'], ['event-id' => $event['id'], 'uid' => $event['uid']]);
 			if (DBM::is_result($item)) {
@@ -504,6 +504,7 @@ class Event extends BaseObject
 		}
 
 		// Query for the event by date.
+		// @todo Slow query (518 seconds to run), to be optimzed
 		$r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink`,
 					`item`.`author-name`, `item`.`author-avatar`, `item`.`author-link` FROM `event`
 				LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` AND `item`.`uid` = `event`.`uid`
@@ -736,7 +737,7 @@ class Event extends BaseObject
 
 		$events = dba::select('event', $fields, $conditions);
 		if (DBM::is_result($events)) {
-			$return = $events;
+			$return = dba::inArray($events);
 		}
 
 		return $return;