friendica
/
friendica
mirror of https://git.friendi.ca/friendica/friendica.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix typo in mod/events 

- Add todo in Model\Event
pull/4657/head
Hypolite Petovan 2018-03-17 16:43:15 -04:00
parent 72b552895e
commit 95792f6b79
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mod/events.php
View File

@ -339,7 +339,7 @@ function events_content(App $a) {
// get events by id or by date
if ($event_params['event_id']) {
$r = Event::getListById(local_user(), $event_params['event-id']);
$r = Event::getListById(local_user(), $event_params['event_id']);
} else {
$r = Event::getListByDate(local_user(), $event_params);
}
@ -370,7 +370,7 @@ function events_content(App $a) {
}
if (x($_GET, 'id')) {
$tpl = get_markup_template("event.tpl");
$tpl = get_markup_template("event.tpl");
} else {
$tpl = get_markup_template("events_js.tpl");
}

1
src/Model/Event.php
View File

@ -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`