From e878b324441e7c9274cae9ede15fc7109e954b90 Mon Sep 17 00:00:00 2001
From: pichalite <pichalite.com@gmail.com>
Date: Thu, 10 Mar 2016 21:24:15 +0000
Subject: [PATCH 1/2] closes #4258

---
 public/language/en_GB/groups.json | 1 +
 src/controllers/admin/groups.js   | 2 +-
 src/controllers/groups.js         | 1 +
 src/views/admin/manage/group.tpl  | 5 +++++
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/public/language/en_GB/groups.json b/public/language/en_GB/groups.json
index 5bade84eea..8d129fe376 100644
--- a/public/language/en_GB/groups.json
+++ b/public/language/en_GB/groups.json
@@ -47,6 +47,7 @@
 	"details.hidden": "Hidden",
 	"details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually",
 	"details.delete_group": "Delete Group",
+	"details.private_system_help": "Private groups is disabled at system level, this option does not do anything",
 
 	"event.updated": "Group details have been updated",
 	"event.deleted": "The group \"%1\" has been deleted",
diff --git a/src/controllers/admin/groups.js b/src/controllers/admin/groups.js
index dc8bf6ff82..03b3514327 100644
--- a/src/controllers/admin/groups.js
+++ b/src/controllers/admin/groups.js
@@ -66,7 +66,7 @@ groupsController.get = function(req, res, callback) {
 			return callback(err);
 		}
 		group.isOwner = true;
-		res.render('admin/manage/group', {group: group});
+		res.render('admin/manage/group', {group: group, allowPrivateGroups: parseInt(meta.config.allowPrivateGroups, 10) === 1});
 	});
 };
 
diff --git a/src/controllers/groups.js b/src/controllers/groups.js
index c77c2c61ee..a67700c0d9 100644
--- a/src/controllers/groups.js
+++ b/src/controllers/groups.js
@@ -90,6 +90,7 @@ groupsController.details = function(req, res, callback) {
 			}
 			results.title = '[[pages:group, ' + results.group.displayName + ']]';
 			results.breadcrumbs = helpers.buildBreadcrumbs([{text: '[[pages:groups]]', url: '/groups' }, {text: results.group.displayName}]);
+			results.allowPrivateGroups = parseInt(meta.config.allowPrivateGroups, 10) === 1;
 			plugins.fireHook('filter:group.build', {req: req, res: res, templateData: results}, next);
 		}
 	], function(err, results) {
diff --git a/src/views/admin/manage/group.tpl b/src/views/admin/manage/group.tpl
index 28cd6c006e..f117af85ab 100644
--- a/src/views/admin/manage/group.tpl
+++ b/src/views/admin/manage/group.tpl
@@ -40,6 +40,11 @@
 					<div class="checkbox">
 						<label>
 							<input id="group-private" name="private" type="checkbox"<!-- IF group.private --> checked<!-- ENDIF group.private -->> <strong>[[groups:details.private]]</strong>
+							<!-- IF !allowPrivateGroups -->
+							<p class="help-block">
+								[[groups:details.private_system_help]]
+							</p>
+							<!-- ENDIF !allowPrivateGroups -->
 							<p class="help-block">
 								[[groups:details.private_help]]
 							</p>

From de421d5f8cc85cc2090c92fa721976996691e76a Mon Sep 17 00:00:00 2001
From: pichalite <pichalite@users.noreply.github.com>
Date: Fri, 11 Mar 2016 06:41:21 -0800
Subject: [PATCH 2/2] remove language string in ACP

---
 src/views/admin/manage/group.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/admin/manage/group.tpl b/src/views/admin/manage/group.tpl
index f117af85ab..f1e14335ea 100644
--- a/src/views/admin/manage/group.tpl
+++ b/src/views/admin/manage/group.tpl
@@ -42,7 +42,7 @@
 							<input id="group-private" name="private" type="checkbox"<!-- IF group.private --> checked<!-- ENDIF group.private -->> <strong>[[groups:details.private]]</strong>
 							<!-- IF !allowPrivateGroups -->
 							<p class="help-block">
-								[[groups:details.private_system_help]]
+								Private groups is disabled at system level, this option does not do anything
 							</p>
 							<!-- ENDIF !allowPrivateGroups -->
 							<p class="help-block">