summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Walker <walkah@walkah.net>2010-02-26 17:09:50 -0500
committerJames Walker <walkah@walkah.net>2010-02-26 17:09:50 -0500
commit1cf08c7ad7704cd92d59f319573e831d1115e996 (patch)
tree49212d7b3a97e950bfac5795a34c837d5fba83fa
parent6ee7660a585faf290dc1650a714d280b40ac3a2d (diff)
MagicEnvelope::parse shouldn't be called statically
-rw-r--r--plugins/OStatus/lib/salmonaction.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/OStatus/lib/salmonaction.php b/plugins/OStatus/lib/salmonaction.php
index 9ca350e67..fa9dc3b1d 100644
--- a/plugins/OStatus/lib/salmonaction.php
+++ b/plugins/OStatus/lib/salmonaction.php
@@ -54,8 +54,9 @@ class SalmonAction extends Action
common_log(LOG_DEBUG, "Salmon signature verification failed.");
$this->clientError(_m('Salmon signature verification failed.'));
} else {
- $env = MagicEnvelope::parse($xml);
- $xml = MagicEnvelope::unfold($env);
+ $magic_env = new MagicEnvelope();
+ $env = $magic_env->parse($xml);
+ $xml = $magic_env->unfold($env);
}