Merge branch '2019.06-rc'

# Conflicts:
#	CHANGELOG
#	VERSION
#	boot.php

diff --git a/CHANGELOG b/CHANGELOG
index 6fcb337868f0a02285fb40de7ab6c949cca442d5..1fa98ee870834a15ff5b2477fdf2db744a5e634a 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 2019.06 (UNRELEASED) (2019-06-23)
+Version 2019.06 (2019-06-23)
   Friendica Core:
     Update to the tranlation (CS, DE, EN-GB, EN-US, ET, FR, IT, PL, PT-BR, SV) [translation teams]
     Update to the documentation [nupplaphil, realkinetix, MrPetovan]
@@ -63,13 +63,16 @@ Version 2019.06 (UNRELEASED) (2019-06-23)
     xmpp:
       Marked addon as unsupported because of various incompatibilities with themes [MrPetovan]
 
-
   Closed Issues:
     1012, 2209, 2528, 3309, 3717, 3816, 3869, 4453, 4999, 5011, 5047, 5276, 5850, 5983, 6303, 6319, 6379, 6410, 6477,
        6478, 6720, 6799, 6813, 6819, 6861, 6864, 6879, 6903, 6916, 6917, 6918, 6921, 6927, 6929, 6936, 6938, 6941, 6943,
        6947, 6948, 6950, 6952, 6983, 6999, 7023, 7036, 7047, 7106, 7112, 7119, 7128, 7130, 7131, 7141, 7142, 7150, 7171,
        7183, 7196, 7209, 7223, 7226, 7240, 7241, 7249, 7264, 7269, 7271, 7275, 7300, 7303
 
+Version 2019.04 (2019-04-28)
+  Friendica Core:
+    Fixed a privacy problem with postings accessed by feed [MrPetovan]
+       
 Version 2019.03 (2019-03-22)
   Friendica Core:
     Update to the translation (CS, DE, EN-GB, EN-US, ES, FR, IT, PL, SV, ZH-CN) [translation teams]

diff --git a/mod/display.php b/mod/display.php
index 017b3545b6c9a3cddb032726cf5e3686a5316412..54d479259482556d01b81afb9c34a665cf97717a 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -84,6 +84,10 @@ function display_init(App $a)
                displayShowFeed($item['id'], $a->argc > 3 && $a->argv[3] == 'conversation.atom');
        }
 
+       if ($a->argc >= 3 && $nick == 'feed-item') {
+               displayShowFeed($item['id'], $a->argc > 3 && $a->argv[3] == 'conversation.atom');
+       }
+
        if (!empty($_SERVER['HTTP_ACCEPT']) && strstr($_SERVER['HTTP_ACCEPT'], 'application/atom+xml')) {
                Logger::log('Directly serving XML for id '.$item["id"], Logger::DEBUG);
                displayShowFeed($item["id"], false);