Bugfix for failed events page and api

diff --git a/include/api.php b/include/api.php
index 91a3a34d110f20a926b780bd3db3a7d0cd25fa14..64a896b55498e2579e475225c08e5d385bfcd8f2 100644 (file)
--- 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 616018bb77a629c848f875652b9ce7d7876ced6f..785558beddadb994425be575867243a66a903ac8 100644 (file)
--- 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'))