? .DS_Store
? .new.IM89Pp
? .new.i3lCPR
? remove_schema_update_d6_00.patch
Index: vocabindex.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/vocabindex/vocabindex.install,v
retrieving revision 1.1.2.3.4.30
diff -u -p -r1.1.2.3.4.30 vocabindex.install
--- vocabindex.install	19 Dec 2008 00:01:07 -0000	1.1.2.3.4.30
+++ vocabindex.install	18 Sep 2009 16:52:54 -0000
@@ -121,14 +121,19 @@ function vocabindex_update_6200() {
   vocabindex_delete_menu_items();
   cache_clear_all('vocabindex', 'cache', TRUE);
 
-  // Delete the update status flag. Only necessary for the latest hook_update_N
-  // implementation.
-  variable_del('vocabindex_schema_update', TRUE);
-
   return $ret;
 }
 
 /**
+ * Implementation of hook_update_N().
+ *
+ * Remove schema update variable that is no longer necessary.
+ */
+function vocabindex_update_6201() {
+  variable_del('vocabindex_schema_update');
+}
+
+/**
  * Create VIs from all vocabularies.
  *
  * Used after an update or installation.
Index: vocabindex.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/vocabindex/vocabindex.module,v
retrieving revision 1.1.2.5.2.85
diff -u -p -r1.1.2.5.2.85 vocabindex.module
--- vocabindex.module	17 Sep 2009 11:36:01 -0000	1.1.2.5.2.85
+++ vocabindex.module	18 Sep 2009 16:52:54 -0000
@@ -54,26 +54,12 @@ function vocabindex_perm() {
     'administer vocabulary index',
     'view vocabulary index pages',
   );
-}
-
-/**
- * Implementation of hook_init().
- */
-function vocabindex_init() {
-  if (vocabindex_update_status() == FALSE) {
-    $path = base_path() . 'update.php';
-    drupal_set_message(t("Please proceed to !update.php to update your database to Vocabulary Index 2.", array('!update.php' => '<a href="' . $path . '">update.php</a>')), 'error');
-  }
 }
 
 /**
  * Implementation of hook_menu().
  */
 function vocabindex_menu() {
-  if (vocabindex_update_status() == FALSE) {
-    return array();
-  }
-
   $items[_vocabindex_menu_paths('admin_main')] = array(
     'title' => 'Vocabulary Index',
     'description' => 'Create index pages for vocabularies.',
@@ -376,25 +362,6 @@ function vocabindex_menu_base() {
 }
 
 /**
- * Check if the latest DB updates for this module have been performed.
- */
-function vocabindex_update_status() {
-  if (!is_null(variable_get('vocabindex_schema_update', NULL))) {
-    return variable_get('vocabindex_schema_update', NULL);
-  }
-  elseif (module_exists('vocabindex')) {
-    require_once('includes/install.inc');
-    module_load_include('install', 'vocabindex');
-    $current = drupal_get_installed_schema_version('vocabindex');
-    $available = array_pop(drupal_get_schema_versions('vocabindex'));
-    $uptodate = $current < $available ? FALSE : TRUE;
-    variable_set('vocabindex_schema_update', $uptodate);
-
-    return $uptodate;
-  }
-}
-
-/**
  * Menu path wildcard for alphabetical VIs.
  *
  * @param $letter