From 36a49cd9943e1620ce4fab17be85d9953c3b548a Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Thu, 15 Jan 2015 10:44:27 -0500
Subject: [PATCH] guests can no longer attempt to join a group, #2588

---
 public/src/client/groups/details.js |  2 +-
 src/groups.js                       | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/public/src/client/groups/details.js b/public/src/client/groups/details.js
index 62371368e8..c439216d25 100644
--- a/public/src/client/groups/details.js
+++ b/public/src/client/groups/details.js
@@ -58,7 +58,7 @@ define('forum/groups/details', ['iconSelect', 'vendor/colorpicker/colorpicker',
 						if (!err) {
 							ajaxify.refresh();
 						} else {
-							app.alertError(err);
+							app.alertError(err.message);
 						}
 					});
 					break;
diff --git a/src/groups.js b/src/groups.js
index da7a0f2a41..0f41e1654f 100644
--- a/src/groups.js
+++ b/src/groups.js
@@ -599,11 +599,15 @@ var async = require('async'),
 	};
 
 	Groups.requestMembership = function(groupName, uid, callback) {
-		db.setAdd('group:' + groupName + ':pending', uid, callback);
-		plugins.fireHook('action:groups.requestMembership', {
-			groupName: groupName,
-			uid: uid
-		});
+		if (parseInt(uid, 10) > 0) {
+			db.setAdd('group:' + groupName + ':pending', uid, callback);
+			plugins.fireHook('action:groups.requestMembership', {
+				groupName: groupName,
+				uid: uid
+			});
+		} else {
+			callback(new Error('[[error:not-logged-in]]'));
+		}
 	};
 
 	Groups.acceptMembership = function(groupName, uid, callback) {