Merge branch 'master' of gitorious.org:statusnet/mainline

2012-07-28 13:59:40 -04:00
parent d155936d98 3ad77e8bb2
commit 330041e8bf
17 changed files with 685 additions and 4 deletions
--- a/plugins/OStatus/actions/ostatusgroup.php
+++ b/plugins/OStatus/actions/ostatusgroup.php
@@ -146,6 +146,8 @@ class OStatusGroupAction extends OStatusSubAction
        try {
            $user->joinGroup($group);
        } catch (Exception $e) {
+            common_log(LOG_ERR, "Exception on remote group join: " . $e->getMessage());
+            common_log(LOG_ERR, $e->getTraceAsString());
            // TRANS: OStatus remote group subscription dialog error.
            $this->showForm(_m('Remote group join failed!'));
            return;