aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-05 21:39:02 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-05 21:39:02 +0000
commit59b6d85ff21c181718a367e40bdfd1c56c2be3a2 (patch)
tree88f3586688bbf82bc1c4cc1f0f045fb17bfff9c5
parentb878ea5e67cf47aad416aadd0e6ecae1c56da4b9 (diff)
downloadelgg-59b6d85ff21c181718a367e40bdfd1c56c2be3a2.tar.gz
elgg-59b6d85ff21c181718a367e40bdfd1c56c2be3a2.tar.bz2
fixed a bug with invisible groups - saving and display both had a problem
git-svn-id: http://code.elgg.org/elgg/trunk@8592 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--mod/groups/actions/groups/edit.php2
-rw-r--r--mod/groups/views/default/forms/groups/edit.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/mod/groups/actions/groups/edit.php b/mod/groups/actions/groups/edit.php
index 331c80be0..3a0376497 100644
--- a/mod/groups/actions/groups/edit.php
+++ b/mod/groups/actions/groups/edit.php
@@ -99,7 +99,7 @@ if ($new_group_flag) {
// Invisible group support
if (elgg_get_plugin_setting('hidden_groups', 'groups') == 'yes') {
$visibility = (int)get_input('vis', '', false);
- if ($visibility != ACCESS_PUBLIC || $visibility != ACCESS_LOGGED_IN) {
+ if ($visibility != ACCESS_PUBLIC && $visibility != ACCESS_LOGGED_IN) {
$visibility = $group->group_acl;
}
diff --git a/mod/groups/views/default/forms/groups/edit.php b/mod/groups/views/default/forms/groups/edit.php
index 8b5a3c33e..1a4e95513 100644
--- a/mod/groups/views/default/forms/groups/edit.php
+++ b/mod/groups/views/default/forms/groups/edit.php
@@ -9,7 +9,7 @@
if (isset($vars['entity'])) {
$membership = $vars['entity']->membership;
$access = $vars['entity']->access_id;
- if ($access != ACCESS_PUBLIC || ACCESS_LOGGED_IN) {
+ if ($access != ACCESS_PUBLIC && $access != ACCESS_LOGGED_IN) {
// group only - this is done to handle access not created when group is created
$access = ACCESS_PRIVATE;
}