Merge remote-tracking branch 'upstream/develop' into failed

[friendica.git] / src / Protocol / Salmon.php

diff --git a/src/Protocol/Salmon.php b/src/Protocol/Salmon.php
index 0d234b53f0151340494bfede168276e4382dcbd9..77084591022b0fa2f994ab893dbc23de53d06228 100644 (file)
--- a/src/Protocol/Salmon.php
+++ b/src/Protocol/Salmon.php
@@ -78,7 +78,7 @@ class Salmon
                }
 
 
-               Logger::log('Key located: ' . print_r($ret, true));
+               Logger::notice('Key located', ['ret' => $ret]);
 
                if (count($ret) == 1) {
                        // We only found one one key so we don't care if the hash matches.
@@ -111,13 +111,13 @@ class Salmon
        {
                // does contact have a salmon endpoint?
 
-               if (! strlen($url)) {
+               if (!strlen($url)) {
                        return;
                }
 
-               if (! $owner['sprvkey']) {
+               if (!$owner['sprvkey']) {
                        Logger::log(sprintf("user '%s' (%d) does not have a salmon private key. Send failed.",
-                       $owner['username'], $owner['uid']));
+                       $owner['name'], $owner['uid']));
                        return;
                }