Bad variable names (fixes last commit)

diff --git a/plugins/OStatus/lib/magicenvelope.php b/plugins/OStatus/lib/magicenvelope.php
index e6fa9ceda17c0779707154a88c6f969e88fcdec2..b49a8b4d3a307686b949a2177d85e47d7a3b91db 100644 (file)
--- 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 c6e15ff21c65e749a2de230099b30ba04db179a2..250a85aaad7d759f753f26b4255f7f65142be1e4 100644 (file)
--- 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;
         }