diff options
| author | Zach Copley <zach@status.net> | 2010-02-26 22:52:49 +0000 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2010-02-26 22:52:49 +0000 |
| commit | dccc9954462a014f4d241091777c3834887d933b (patch) | |
| tree | b702e2cacf346b9f1a19d0f85f2f3ebe7d8d7217 /plugins/OStatus/lib/salmonaction.php | |
| parent | 1883da64185022866572f9eb27938b4cc7724328 (diff) | |
| parent | a5cfda850537e5e55d61f381cfac7d5100aa3bea (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'plugins/OStatus/lib/salmonaction.php')
| -rw-r--r-- | plugins/OStatus/lib/salmonaction.php | 5 |
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); } |