Avoiding some notices

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 90b86789cc5e8b9201016f2b8cc7c4defc0cb562..c6e11bca67c6e0400d4c2d440d4a80ac2480b2c0 100644 (file)
--- a/src/Model/Contact.php
+++ b/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])) {

diff --git a/src/Module/Login.php b/src/Module/Login.php
index b312a7879dbc90ae525f1b7ee9edba2ed7c963e1..41ea917cf3e8087c49e6ccbee8502afea1feefe5 100644 (file)
--- a/src/Module/Login.php
+++ b/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'])

diff --git a/src/Util/JsonLD.php b/src/Util/JsonLD.php
index 062fb00cd44768f99f23cc2c8bbb516899de2fb0..e9c52d3d050a8594cdf31e7f0822b76e3e3b93fa 100644 (file)
--- a/src/Util/JsonLD.php
+++ b/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';
                }