From 50f6baab30b7c951ce01791a7141656fb6d6ce4f Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Tue, 27 Aug 2019 07:09:31 +0200
Subject: [PATCH 1/2] added some missing closed isses from the 2019.06 release,
 fixed format

---
 CHANGELOG | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index cb7b723da9..a6f5584b08 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -46,10 +46,10 @@ Version 2019.09-dev (UNRELEASED)
       Added alternative text support for images [annando]
 
   Closed Issues:
-    3816, 4815, 6675, 7235, 7293, 7314, 7317, 7337, 7338, 7346, 7350,
-    7367, 7383, 7396, 7397, 7401, 7406, 7408, 7426, 7428, 7456, 7442,
-    7457, 7468, 7471, 7473, 7488, 7497, 7498, 7501, 7507, 7522, 7527,
-    7536, 7542, 7545
+    3816, 4815, 6384, 6675, 7235, 7293, 7314, 7317, 7337, 7338, 7346,
+    7350, 7367, 7383, 7396, 7397, 7401, 7406, 7408, 7426, 7428, 7456,
+    7442, 7457, 7468, 7471, 7473, 7488, 7497, 7498, 7501, 7507, 7522,
+    7527, 7536, 7542, 7545
 
 Version 2019.06 (2019-06-23)
   Friendica Core:
@@ -78,8 +78,8 @@ Version 2019.06 (2019-06-23)
     Fixed an issue with legacy loglevel mapping [nupplaphil]
     Fixed contact suggestions [annando]
     Fixed an issue with frio hovercard [nupplaphil]
-	Fixed event interaction federation [annando]
-	Fixed remote image permission [deantownsley]
+    Fixed event interaction federation [annando]
+    Fixed remote image permission [deantownsley]
     General Code cleaning and restructuring [annando, nupplaphil, tobiasd]
     Added frio color scheme sharing [JeroenED]
     Added syslog and stream Logger [nupplaphil]
@@ -93,6 +93,7 @@ Version 2019.06 (2019-06-23)
     Added rule-based router [MrPetovan, nupplaphil]
     Added themed error pages with mascot [MrPetovan, lostinlight]
     Added contact relationship filter [MrPetovan]
+    Added native reshares and reshare count [annando]
     Removed the old queue mechanism (deferred workers are now used) [annando]
     Removed BasePath and Hostname settings from the admin panel [nupplaphil]
     Remove support for defunct F-Droid Friendica app [MrPetovan]
@@ -117,10 +118,13 @@ Version 2019.06 (2019-06-23)
       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
+     838, 1012, 2209, 2528, 3309, 3717, 3816, 3869, 4453, 4999, 5011,
+    5047, 5276, 5850, 5983, 6245, 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, 7012, 7020, 7023, 7031, 7036, 7047, 7106, 7110, 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:

From 1c3a5e1e6fd5c51c3b2a58ac3cd892520ebe5291 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Tue, 27 Aug 2019 07:10:51 +0200
Subject: [PATCH 2/2] added USE statement and changed statement as requested in
 #7305#discussion_r296461181

---
 src/Protocol/DFRN.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 273a7c248c..f55a80a6fd 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -20,6 +20,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
+use Friendica\Core\Session;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Conversation;
@@ -2905,7 +2906,7 @@ class DFRN
 			// and the sense in the $remote[]["cid"] in the session are opposite.
 			// In the session variable the user currently fetching is the contact
 			// while $contact_nick is the nick of tho user who owns the stuff being fetched.
-			foreach (\Friendica\Core\Session::get('remote', []) as $visitor) {
+			foreach (Session::get('remote', []) as $visitor) {
 				if ($visitor['uid'] == $contact_uid && $visitor['cid'] == $r[0]['id']) {
 					return;
 				}