From 0c310db23d253e489c27b80f99aeaaa06275fea6 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Mon, 16 Jan 2017 20:59:16 +0000
Subject: [PATCH] Bugfix for failed events page and api

---
 include/api.php   | 9 ++++++---
 include/event.php | 6 +++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/include/api.php b/include/api.php
index 91a3a34d11..64a896b554 100644
--- a/include/api.php
+++ b/include/api.php
@@ -2344,6 +2344,9 @@
 	 * 			dislikes => int count
 	 */
 	function api_format_items_activities(&$item, $type = "json") {
+
+		$a = get_app();
+
 		$activities = array(
 			'like' => array(),
 			'dislike' => array(),
@@ -2521,9 +2524,9 @@
 
 			// Retweets are only valid for top postings
 			// It doesn't work reliable with the link if its a feed
-			#$IsRetweet = ($item['owner-link'] != $item['author-link']);
-			#if ($IsRetweet)
-			#	$IsRetweet = (($item['owner-name'] != $item['author-name']) OR ($item['owner-avatar'] != $item['author-avatar']));
+			//$IsRetweet = ($item['owner-link'] != $item['author-link']);
+			//if ($IsRetweet)
+			//	$IsRetweet = (($item['owner-name'] != $item['author-name']) OR ($item['owner-avatar'] != $item['author-avatar']));
 
 
 			if ($item["id"] == $item["parent"]) {
diff --git a/include/event.php b/include/event.php
index 616018bb77..785558bedd 100644
--- a/include/event.php
+++ b/include/event.php
@@ -206,7 +206,7 @@ function bbtoevent($s) {
 }
 
 
-function sort_by_date(App $a) {
+function sort_by_date($a) {
 
 	usort($a,'ev_compare');
 	return $a;
@@ -510,7 +510,7 @@ function event_by_id($owner_uid = 0, $event_params, $sql_extra = '') {
 	// query for the event by event id
 	$r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink`,
 			`item`.`author-name`, `item`.`author-avatar`, `item`.`author-link` FROM `event`
-		STRAIGHT_JOIN `item` ON `item`.`event-id` = `event`.`id` AND `item`.`uid` = `event`.`uid`
+		LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` AND `item`.`uid` = `event`.`uid`
 		WHERE `event`.`uid` = %d AND `event`.`id` = %d $sql_extra",
 		intval($owner_uid),
 		intval($event_params["event_id"])
@@ -543,7 +543,7 @@ function events_by_date($owner_uid = 0, $event_params, $sql_extra = '') {
 	// query for the event by date
 	$r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink`,
 				`item`.`author-name`, `item`.`author-avatar`, `item`.`author-link` FROM `event`
-			STRAIGHT_JOIN `item` ON `item`.`event-id` = `event`.`id` AND `item`.`uid` = `event`.`uid`
+			LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` AND `item`.`uid` = `event`.`uid`
 			WHERE `event`.`uid` = %d AND event.ignore = %d
 			AND ((`adjust` = 0 AND (`finish` >= '%s' OR (nofinish AND start >= '%s')) AND `start` <= '%s')
 			OR  (`adjust` = 1 AND (`finish` >= '%s' OR (nofinish AND start >= '%s')) AND `start` <= '%s'))
-- 
2.39.5