Browse Source

Avoiding some notices

pull/6440/head
Michael 2 years ago
parent
commit
c1dec50248
3 changed files with 6 additions and 3 deletions
  1. +3
    -0
      src/Model/Contact.php
  2. +2
    -2
      src/Module/Login.php
  3. +1
    -1
      src/Util/JsonLD.php

+ 3
- 0
src/Model/Contact.php View File

@ -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])) {


+ 2
- 2
src/Module/Login.php View File

@ -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'])


+ 1
- 1
src/Util/JsonLD.php View File

@ -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';
}


Loading…
Cancel
Save