Index: tac_lite.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/tac_lite/tac_lite.install,v
retrieving revision 1.3.2.1
diff -u -p -r1.3.2.1 tac_lite.install
--- tac_lite.install	21 Nov 2008 18:23:34 -0000	1.3.2.1
+++ tac_lite.install	24 Nov 2008 11:34:52 -0000
@@ -50,3 +50,20 @@ function tac_lite_update_3() {
   $ret[] = update_sql("UPDATE {variable} SET name='tac_lite_grants_scheme_1' WHERE name='tac_lite_default_grants'");
   return $ret;
 }
+
+/**
+ * Start of updates to Drupal 6.x-1.2. Start using Drupal standard update numbers.
+ */
+
+/**
+ * Rename permission from "administer_tac_lite" to "administer tac_lite" for UI consistency.
+ */
+function tac_lite_update_6001() {
+  $ret = array();
+  $result = db_query("SELECT * FROM {permission} WHERE perm LIKE '%administer_tac_lite%'");
+  while ($permission = db_fetch_object($result)) {
+    $perm = str_replace('administer_tac_lite', 'administer tac_lite', $permission->perm);
+    $ret[] = update_sql("UPDATE {permission} SET perm = '". db_escape_string($perm) ."' WHERE rid =". $permission->rid);
+  }
+  return $ret;
+}
Index: tac_lite.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/tac_lite/tac_lite.module,v
retrieving revision 1.9
diff -u -p -r1.9 tac_lite.module
--- tac_lite.module	22 Jul 2008 15:55:23 -0000	1.9
+++ tac_lite.module	24 Nov 2008 11:34:53 -0000
@@ -1,14 +1,13 @@
 <?php
-  // $Id: tac_lite.module,v 1.9 2008/07/22 15:55:23 yogadex Exp $
+// $Id: tac_lite.module,v 1.9 2008/07/22 15:55:23 yogadex Exp $
+
 /**
  * @file
- * Control access to site content based on taxonomy, roles and users.
- *
- *
+ *   Control access to site content based on taxonomy, roles and users.
  */
 
 /**
- * Implementation of hook_help
+ * Implementation of hook_help().
  */
 function tac_lite_help($section) {
   switch ($section) {
@@ -33,7 +32,7 @@ function tac_lite_help($section) {
  * Implementation of hook_perm().
  */
 function tac_lite_perm() {
-  return array('administer_tac_lite');
+  return array('administer tac_lite');
 }
 
 /**
@@ -50,14 +49,14 @@ function tac_lite_menu() {
           'page arguments' => array('tac_lite_admin_settings'),
           'type' => MENU_NORMAL_ITEM,
           'weight' => 1, // after 'roles' tab
-          'access arguments' => array('administer_tac_lite'),
+          'access arguments' => array('administer tac_lite'),
     );
 
   $items['admin/user/access/tac_lite/settings'] = 
     array('title' => t('Settings'),
           'type' => MENU_DEFAULT_LOCAL_TASK,
           'weight' => -1,
-          'access arguments' => array('administer_tac_lite'),
+          'access arguments' => array('administer tac_lite'),
     );
   
   $schemes = variable_get('tac_lite_schemes', 1);
@@ -67,7 +66,7 @@ function tac_lite_menu() {
             'page callback' => 'tac_lite_admin_settings_scheme',
             'page arguments' => array((string)$i),
             'type' => MENU_LOCAL_TASK,
-            'access arguments' => array('administer_tac_lite'),
+            'access arguments' => array('administer tac_lite'),
       );
   }
 
@@ -238,19 +237,16 @@ function tac_lite_admin_scheme_form($for
  */
 
 function tac_lite_user($op, $edit, $account, $category = null) {
-  //drupal_set_message("tac_lite_user($op) called."); // debug
 
-  // only for administrators
-  global $user;
-  if (!user_access('administer_tac_lite'))
-	return;
+  if (!user_access('administer tac_lite')) {
+    // Only for tac_lite administrators.
+    return;
+  }
 
   switch ($op) {
   case 'categories':
     return array(array('name' => 'tac_lite',
-                       'title' => 'Taxonomy-based access',
-                       'access callback' => 'user_access',
-                       'access arguments' => array('administer_tac_lite'),
+                       'title' => t('Taxonomy-based access'),
                        'weight' => 5,
                  ),
     );
@@ -460,9 +456,9 @@ function tac_lite_node_grants(&$account,
 function tac_lite_db_rewrite_sql($query, $primary_table, $primary_field, $args) {
   global $user;
 
-  // if administrator, give all access
-  if (user_access('administer_tac_lite')) {
-	return;
+  if (user_access('administer tac_lite')) {
+    // Only for tac_lite administrators.
+    return;
   }
 
   // the vocabularies containing protected info.