wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

Browse Source
This commit is contained in:
Evan Prodromou 2010-02-26 17:29:04 -05:00
commit dced92d6fd
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/OStatus/lib/salmonaction.php
View File

@ -54,8 +54,9 @@ class SalmonAction extends Action
common_log(LOG_DEBUG, "Salmon signature verification failed."); common_log(LOG_DEBUG, "Salmon signature verification failed.");
$this->clientError(_m('Salmon signature verification failed.')); $this->clientError(_m('Salmon signature verification failed.'));
} else { } else {
$env = MagicEnvelope::parse($xml); $magic_env = new MagicEnvelope();
$xml = MagicEnvelope::unfold($env); $env = $magic_env->parse($xml);
$xml = $magic_env->unfold($env);
} }