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

diff --git a/mod/groups/actions/groups/edit.php b/mod/groups/actions/groups/edit.php
index 331c80be0831eaaed8e46d71c18040b3e87430ff..3a03764970dc13ef9603c64892f527fc865d6480 100644 (file)
--- 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 8b5a3c33e4502e91153a4424e59bd82586059f97..1a4e955135ea5cd515ea42f5036ce2cd94df1f5d 100644 (file)
--- 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;
        }