friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #6440 from annando/notices 

Avoiding some notices
This commit is contained in:
Tobias Diekershoff 2019-01-13 19:30:56 +01:00 committed by GitHub
parent 0760b41fac c1dec50248
commit 9aadb52762
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Model/Contact.php
View File

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

4
src/Module/Login.php
View File

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

2
src/Util/JsonLD.php
View File

@ -95,7 +95,7 @@ class JsonLD
// Workaround for Nextcloud Social // Workaround for Nextcloud Social
// See issue https://github.com/nextcloud/social/issues/330 // 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'; $json['@context'][] = 'https://w3id.org/security/v1';
} }