From 2ef887f177bc165355aa037f73ffd18f5061ea98 Mon Sep 17 00:00:00 2001 From: SteveD Date: Tue, 18 Dec 2012 21:29:53 +0000 Subject: [PATCH] Fix bug in 'Everyone except..' class display. Suppress negatives in user initial classes. --- e107_admin/userclass2.php | 2 +- e107_handlers/userclass_class.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/e107_admin/userclass2.php b/e107_admin/userclass2.php index bbd2ad180..1a4ded968 100644 --- a/e107_admin/userclass2.php +++ b/e107_admin/userclass2.php @@ -544,7 +544,7 @@ $ns->tablerender(UCSLAN_21, $text); } // $class_text = $e_userclass->uc_checkboxes('init_classes', $initial_classes, 'classes, force', TRUE); - $class_text = $e_userclass->vetted_tree('init_classes',array($e_userclass,'checkbox_desc'), $initial_classes, 'classes, force'); + $class_text = $e_userclass->vetted_tree('init_classes',array($e_userclass,'checkbox_desc'), $initial_classes, 'classes, force, no-excludes'); $mes->addInfo(UCSLAN_49); diff --git a/e107_handlers/userclass_class.php b/e107_handlers/userclass_class.php index c8be92ad9..73e7d7017 100644 --- a/e107_handlers/userclass_class.php +++ b/e107_handlers/userclass_class.php @@ -412,7 +412,7 @@ class user_class } // Inverted Classes - if(strpos($optlist, 'no-excludes') !== TRUE) + if(strpos($optlist, 'no-excludes') === FALSE) { if (strpos($optlist, 'is-checkbox') !== FALSE) { @@ -646,9 +646,9 @@ class user_class $ret .= $this->vetted_sub_tree($treename, $callback, $p, 0, $current_value, $perms, $opt_options); } - + // Inverted classes. (negative values for exclusion). - if(strpos($optlist, 'no-excludes') !== TRUE) + if(strpos($optlist, 'no-excludes') === FALSE) { if (strpos($optlist, 'is-checkbox') !== FALSE) {