Index: tac_lite.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/tac_lite/tac_lite.module,v
retrieving revision 1.9.2.8
diff -r1.9.2.8 tac_lite.module
154,156c154,157
<     $config = variable_get('tac_lite_config_scheme_' . $scheme, 
<                            array('name' => t('read'), 
<                                  'perms' => array('grant_view')));
---
>     $config = variable_get('tac_lite_config_scheme_' . $scheme, array(
>                              'name' => t('read'), 
>                              'perms' => array('grant_view'),
>                            ));
158,159c159,168
<     $config = variable_get('tac_lite_config_scheme_' . $scheme, 
<                            array('name' => NULL, 'perms' => array()));
---
>     $config = variable_get('tac_lite_config_scheme_' . $scheme, array(
>                              'name' => NULL, 
>                              'perms' => array(),
>                            ));
> 
>   // Merge defaults, for backward compatibility.
>   $config += array(
>     'term_visibility' => isset($config['perms']['grant_view']) && $config['perms']['grant_view'] ? TRUE: FALSE,
>   );
>   
202a212,218
>     $form['tac_lite_config_scheme_' . $i]['term_visibility'] = array(
>       '#type' => 'checkbox',
>       '#title' => t('Restrict Term Visibility'),
>       '#description' => t('If checked, this scheme determines whether a user can view <strong>terms</strong>.  Note the <em>view</em> permission above refers to <strong>node</strong> visibility.  This refers to <strong>term</strong> visibility, for example in a content edit form or tag cloud.'),
>       '#default_value'=> $config['term_visibility'],
>     );
> 
269a286,289
>             $perms = $config['perms'];
>             if ($config['term_visibility']) {
>               $perms[] = t('restrict term visibility');
>             }
273,274c293,294
<               '#description' => t('This scheme includes permissions %perms',
<                                   array('%perms' => implode(' and ', $config['perms']))),
---
>               '#description' => t('This scheme controls %perms.',
>                                   array('%perms' => implode(' and ', $perms))),
276a297
> 
286a308,309
>               $form['tac_lite'][$config['realm']][$vid]['#description'] =
>                 t('Grant permission to this user by selecting terms.  Note that permissions are in addition to those granted based on user roles.');
474a498,499
>   $term_visibility = FALSE;
>   
479c504
<     if (in_array('grant_view', $config['perms'])) {
---
>     if ($config['term_visibility'] || in_array('grant_view', $config['perms'])) {
480a506
>       $term_visibility = TRUE;
484,487c510
<   // Note that if tac_lite is configured, but no schemes support grant_view,
<   // we assume everyone can view all terms.
< 
<   if (count($tids) && is_array($vids) && count($vids)) {
---
>   if ($term_visibility && is_array($vids) && count($vids)) {