From 03fc02c26fb42dd274d0776f1b5f4a8bbf077ca8 Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Tue, 27 May 2014 13:02:26 +0200 Subject: [PATCH] Bad variable names (fixes last commit) --- plugins/OStatus/lib/magicenvelope.php | 2 +- plugins/OStatus/lib/salmon.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/OStatus/lib/magicenvelope.php b/plugins/OStatus/lib/magicenvelope.php index e6fa9ceda1..b49a8b4d3a 100644 --- a/plugins/OStatus/lib/magicenvelope.php +++ b/plugins/OStatus/lib/magicenvelope.php @@ -319,7 +319,7 @@ class MagicEnvelope $magic_env = self::signMessage($text, 'application/atom+xml', $magicsig); - assert($magicenv instanceof MagicEnvelope); + assert($magic_env instanceof MagicEnvelope); return $magic_env; } diff --git a/plugins/OStatus/lib/salmon.php b/plugins/OStatus/lib/salmon.php index c6e15ff21c..250a85aaad 100644 --- a/plugins/OStatus/lib/salmon.php +++ b/plugins/OStatus/lib/salmon.php @@ -65,15 +65,15 @@ class Salmon try { $client = new HTTPClient(); - $client->setBody($envelope); + $client->setBody($envxml); $response = $client->post($endpoint_uri, $headers); } catch (HTTP_Request2_Exception $e) { common_log(LOG_ERR, "Salmon ($class) post to $endpoint_uri failed: " . $e->getMessage()); return false; } if ($response->getStatus() != 200) { - common_log(LOG_ERR, "Salmon ($class) at $endpoint_uri returned status " . - $response->getStatus() . ': ' . $response->getBody()); + common_log(LOG_ERR, sprintf('Salmon at %s returned status %s: %s', + $endpoint_uri, $response->getStatus(), $response->getBody())); return false; } -- 2.39.2