Index: openlayers_proximity.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/openlayers_proximity/openlayers_proximity.module,v
retrieving revision 1.1.2.10
diff -u -p -r1.1.2.10 openlayers_proximity.module
--- openlayers_proximity.module	28 Jul 2010 11:45:51 -0000	1.1.2.10
+++ openlayers_proximity.module	21 Sep 2010 18:07:11 -0000
@@ -180,10 +180,10 @@ function openlayers_proximity_rebuild_in
   if (empty($context['sandbox'])) {
     $context['sandbox']['progress'] = 0;
     $context['sandbox']['current_node'] = 0;
-    $context['sandbox']['types'] = openlayers_proximity_get_types();
-    $context['sandbox']['max'] = db_result(db_query("SELECT COUNT(DISTINCT nid) FROM {node} WHERE type IN ('%s')", implode("', '", $context['sandbox']['types'])));
+    $context['sandbox']['types'] = module_invoke_all('openlayers_proximity_get_types');
+    $context['sandbox']['max'] = db_result(db_query("SELECT COUNT(DISTINCT nid) FROM {node} WHERE type IN (" . db_placeholders($context['sandbox']['types'], 'text') . ")", $context['sandbox']['types']));
   }
-  $result = db_query_range("SELECT nid FROM {node} WHERE type IN ('%s') AND nid > %d ORDER BY nid ASC", implode("', '", $context['sandbox']['types']), $context['sandbox']['current_node'], 0, OPENLAYERS_PROXIMITY_NODES_PER_BATCH);
+  $result = db_query_range("SELECT nid FROM {node} WHERE type IN (" . db_placeholders($context['sandbox']['types'], 'text') . ") AND nid > %d ORDER BY nid ASC", $context['sandbox']['types'], $context['sandbox']['current_node'], 0, OPENLAYERS_PROXIMITY_NODES_PER_BATCH);
   while ($row = db_fetch_array($result)) {
     $node = node_load($row['nid']);
     $index = openlayers_proximity_build_node_index($node);
@@ -272,9 +272,9 @@ function openlayers_proximity_get_wkt_fi
 }
 
 /**
- * Get content types having at least one WKT CCK field.
+ * Implementation of hook_openlayers_proximity_get_types()
  */
-function openlayers_proximity_get_types() {
+function openlayers_proximity_openlayers_proximity_get_types() {
   $types = array();
   $fields = content_fields();
   foreach ($fields as $field) {