Merge pull request #2978 from annando/issue-2518

[friendica.git] / include / event.php

diff --git a/include/event.php b/include/event.php
index a68e1c4626d37cf523711387fbd9539511317135..6c0e2bdec6e68608a5d8267200cb75ea6289f8e6 100644 (file)
--- a/include/event.php
+++ b/include/event.php
@@ -480,6 +480,13 @@ function get_event_strings() {
                        "month" => t("month"),
                        "week" => t("week"),
                        "day" => t("day"),
+                       "allday" => t("all-day"),
+
+                       "noevent" => t("No events to display"),
+
+                       "dtstart_label" => t("Starts:"),
+                       "dtend_label" => t("Finishes:"),
+                       "location_label" => t("Location:")
                );
 
        return $i18n;
@@ -502,7 +509,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`
-               LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` AND `item`.`uid` = `event`.`uid`
+               STRAIGHT_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"])
@@ -535,7 +542,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`
-                       LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` AND `item`.`uid` = `event`.`uid`
+                       STRAIGHT_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'))