Merge pull request #6440 from annando/notices

Avoiding some notices

src/Model/Contact.php

@@ -579,6 +579,9 @@ class Contact extends BaseObject
 	 */
 	public static function terminateFriendship(array $user, array $contact, $dissolve = false)
 	{
+		if (empty($contact['network'])) {
+			return;
+		}
 		if (($contact['network'] == Protocol::DFRN) && $dissolve) {
 			DFRN::deliver($user, $contact, 'placeholder', true);
 		} elseif (in_array($contact['network'], [Protocol::OSTATUS, Protocol::DFRN])) {

src/Module/Login.php

@@ -48,10 +48,10 @@ class Login extends BaseModule
 
 	public static function post()
 	{
-		$return_path = $_SESSION['return_path'];
+		$return_path = defaults($_SESSION, 'return_path', '');
 		session_unset();
 		$_SESSION['return_path'] = $return_path;
-		
+
 		// OpenId Login
 		if (
 			empty($_POST['password'])

src/Util/JsonLD.php

@@ -95,7 +95,7 @@ class JsonLD
 
 		// Workaround for Nextcloud Social
 		// See issue https://github.com/nextcloud/social/issues/330
-		if (is_array($json['@context'])) {
+		if (!empty($json['@context']) && is_array($json['@context'])) {
 			$json['@context'][] = 'https://w3id.org/security/v1';
 		}