Merge remote-tracking branch 'upstream/2019.09-rc' into remote-rework

CHANGELOG

@@ -1,12 +1,13 @@
 Version 2019.09-dev (UNRELEASED)
   Friendica Core:
-    Update to the translations (CS, DE, FR, JA, NL, PL) [translation teams]
+    Update to the translations (CS, DE, EN GB, EN US, FR, JA, NL, PL) [translation teams]
     Update to the themes (frio, vier) [JeroenED, MrPetovan, tobiasd, vinzv]
-    Update to the documentation [guzzisti, vinzv]
+    Update to the documentation [annando, tobiasd, guzzisti, vinzv]
     Enhanced the log output of the background process [annando]
-    Enhanced the vcard translation in the profile (JeroenED)
+    Enhanced the vcard translation in the profile [JeroenED]
     Enhanced the delivery count [annando]
     Enhanced ActivityPub envelopes [MrPetovan]
+    Enhanced communication about deleted accounts via AP [annando]
     Enhanced the following process [annando]
     Enhanced the tests [nupplaphil]
     Enhanced the frontend worker [annando]
@@ -17,8 +18,10 @@ Version 2019.09-dev (UNRELEASED)
     Enhanced server wide theme settings [MrPetovan]
     Enhanced config loading process [MrPetovan, nupplaphil]
     Enhanced handling of emoticons [MrPetovan]
+    Enhanced performance [annando]
     Fixed a bug in the admin panel leading to orphand options [tobiasd]
     Fixed a problem that could lead to duplicated Pleroma contacts [annando]
+    Fixed a problem with the hide profile setting [annando]
     Fixed the problem sending out the post when hitting the enter key in the ACL dialog [MrPetovan]
     Fixed a bug in HTML special character escaping of event titles [MrPetovan]
     Fixed a bug in HTML special character conversion in item titles [MrPetovan]
@@ -26,7 +29,18 @@ Version 2019.09-dev (UNRELEASED)
     Fixed a bug that prevented the display of images in some postings from diaspora* [MrPetovan]
     Fixed a bug in setting the permissions on uploaded images [annando]
     Fixed a bug that lead to potentially unwanted importing threads started by contacts of contacts [annando]
+    Fixed implicit self mentions [MrPetovan]
     Fixed display of register links on closed nodes landing pages [MrPetovan]
+    Fixed the display of [spoiler] tags [MrPetovan]
+    Fixed an issue with photo permissions in private mails [annando]
+    Fixed a bug in the process of following Pleroma accounts [annando]
+    Fixed a bug that caused notifications about locally deleted items [annando]
+    Fixed the link to the source of an event [MrPetovan]
+    Fixed a problem that caused authors from twitter postings having no profile pic [annando]
+    Fixed a bug in BBCode -> Markdown conversation for font size [annando]
+    Fixed a BBCode parser problem with the audio tag [MrPetovan]
+    Fixed a session problem [annando]
+    Fixed a problem with the autoinstaller [nupplaphil]
     General code cleaning [annando, MrPetovan, nupplaphil]
     Removed contacts auto completion (in /contacts [MrPetovan]
     Replaced FontAwesome by ForkAwesome in frio theme [vinzv]
@@ -37,19 +51,29 @@ Version 2019.09-dev (UNRELEASED)
     Added support of wildcards to server block lists [MrPetovan]
     Added app specific passwords when using 2FA [MrPetovan]
     Added fetching of postings via URL to interact with public postings [annando]
+    Added opt-out flag for federated search engines and associated header information for profiles [annando]
 
   Friendica Addons:
-    Update to the translation (CS, DE, FR, JA, NL SV) [translation teams]
+    Update to the translation (CS, DE, EN GB, EN US, ES, FR, JA, NL SV) [translation teams]
     General code cleanup [nupplaphil, Quix0r]
+    blockbot:
+      Added translations
+      Added more bots [annando]
+      Added admin panel settings [annando]
+    tumblr:
+      Changed used URLs to https adopting tumblrs change [annando]
     twitter:
       Enhanced handling of multi image postings [annando]
+      Enhanced display of quoted tweets [MrPetovan]
       Added alternative text support for images [annando]
 
   Closed Issues:
-    3816, 4815, 6384, 6675, 7235, 7293, 7314, 7317, 7337, 7338, 7346,
+     870, 1605, 2199, 3239, 3816, 4117, 4815, 5721, 6384, 6521, 6553,
-    7350, 7367, 7383, 7396, 7397, 7401, 7406, 7408, 7426, 7428, 7456,
+    6675, 7212, 7235, 7285, 7293, 7314, 7317, 7337, 7338, 7346, 7350,
-    7442, 7457, 7468, 7471, 7473, 7488, 7497, 7498, 7501, 7507, 7522,
+    7367, 7383, 7396, 7397, 7401, 7406, 7408, 7426, 7428, 7456, 7442,
-    7527, 7536, 7542, 7545, 7576, 7586
+    7457, 7468, 7471, 7473, 7488, 7497, 7498, 7501, 7507, 7521, 7526,
+    7527, 7536, 7542, 7545, 7576, 7586, 7594, 7597, 7603, 7610, 7618,
+    7629, 7635, 7638, 7663, 7665
 
 Version 2019.06 (2019-06-23)
   Friendica Core:

mod/redir.php

@@ -157,7 +157,7 @@ function redir_magic($a, $cid, $url)
 	$serverret = Network::curl($basepath . '/magic');
 	if ($serverret->isSuccess()) {
 		$separator = strpos($target_url, '?') ? '&' : '?';
-		$target_url .= $separator . 'zrl=' . urlencode($visitor);
+		$target_url .= $separator . 'zrl=' . urlencode($visitor) . '&addr=' . urlencode($contact_url);
 
 		Logger::info('Redirecting with magic', ['target' => $target_url, 'visitor' => $visitor, 'contact' => $contact_url]);
 		$a->redirect($target_url);

src/Module/Magic.php

@@ -33,13 +33,10 @@ class Magic extends BaseModule
 		$test = (!empty($_REQUEST['test']) ? intval($_REQUEST['test']) : 0);
 		$owa  = (!empty($_REQUEST['owa'])  ? intval($_REQUEST['owa'])  : 0);
 
-		// NOTE: I guess $dest isn't just the profile url (could be also
+		if (!empty($addr)) {
-		// other profile pages e.g. photo). We need to find a solution
-		// to be able to redirct to other pages than the contact profile.
-		$cid = Contact::getIdForURL($dest);
-
-		if (!$cid && !empty($addr)) {
 			$cid = Contact::getIdForURL($addr);
+		} else {
+			$cid = Contact::getIdForURL($dest);
 		}
 
 		if (!$cid) {

tests/bootstrap.php

@@ -3,17 +3,9 @@
  * This file is loaded by PHPUnit before any test.
  */
 
-use PHPUnit\DbUnit\DataSet\YamlDataSet;
-use PHPUnit\DbUnit\TestCaseTrait;
 use PHPUnit\Framework\TestCase;
 
 // Backward compatibility
 if (!class_exists(TestCase::class)) {
 	class_alias(PHPUnit_Framework_TestCase::class, TestCase::class);
 }
-if (!trait_exists(TestCaseTrait::class)) {
-	class_alias(PHPUnit_Extensions_Database_TestCase_Trait::class, TestCaseTrait::class);
-}
-if (!class_exists(YamlDataSet::class)) {
-	class_alias(PHPUnit_Extensions_Database_DataSet_YamlDataSet::class, YamlDataSet::class);
-}