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

2010-02-21 14:18:16 -05:00
parent ad3406a919 3e7a2a4014
commit 4209082677
2 changed files with 8 additions and 0 deletions
--- a/plugins/OStatus/lib/salmonaction.php
+++ b/plugins/OStatus/lib/salmonaction.php
@@ -51,6 +51,7 @@ class SalmonAction extends Action

        if ($dom->documentElement->namespaceURI != Activity::ATOM ||
            $dom->documentElement->localName != 'entry') {
+            common_log(LOG_DEBUG, "Got invalid Salmon post: $xml");
            $this->clientError(_m('Salmon post must be an Atom entry.'));
        }
        // XXX: check the signature