diff options
author | Brion Vibber <brion@pobox.com> | 2010-02-26 09:35:28 -0800 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-02-26 09:35:28 -0800 |
commit | 8dfc8f1635940b096e7f4025e3aef0ca4f909eb2 (patch) | |
tree | 9fce4aa765d56496031698f219da2f0f82b33e80 /plugins/OStatus/lib/salmon.php | |
parent | 8914b69d5055c1bc7d0604ee338ffdaf6b0a8606 (diff) | |
parent | b331e971b055386a126aaec27d661f26ba3b813c (diff) |
Merge branch 'testing' into 0.9.x
Diffstat (limited to 'plugins/OStatus/lib/salmon.php')
-rw-r--r-- | plugins/OStatus/lib/salmon.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/plugins/OStatus/lib/salmon.php b/plugins/OStatus/lib/salmon.php index b5f178cc6..9d4359f74 100644 --- a/plugins/OStatus/lib/salmon.php +++ b/plugins/OStatus/lib/salmon.php @@ -72,8 +72,12 @@ class Salmon // TODO: Should probably be getting the signer uri as an argument? $signer_uri = $magic_env->getAuthor($text); - $env = $magic_env->signMessage($text, 'application/atom+xml', $signer_uri); - + try { + $env = $magic_env->signMessage($text, 'application/atom+xml', $signer_uri); + } catch (Exception $e) { + common_log(LOG_ERR, "Salmon signing failed: ". $e->getMessage()); + return $text; + } return $magic_env->unfold($env); } |