Index: civicrm_subscribe.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/civicrm_subscribe/civicrm_subscribe.module,v
retrieving revision 1.1.2.16
diff -u -u -p -r1.1.2.16 civicrm_subscribe.module
--- civicrm_subscribe.module	17 Apr 2008 03:45:03 -0000	1.1.2.16
+++ civicrm_subscribe.module	20 Jun 2008 15:05:42 -0000
@@ -34,9 +34,18 @@ function civicrm_subscribe_menu($may_cac
   return $items;
 }
 
+function civicrm_subscribe_civicrm_initialize() {
+  if (function_exists('civicrm20_initialize')) {
+    civicrm20_initialize(true);
+  }
+  else {
+    civicrm_initialize(true);
+  }
+}
+
 function civicrm_subscribe_admin_settings() {
   if (module_exists('civicrm')) {
-    civicrm_initialize(true);
+    civicrm_subscribe_civicrm_initialize();
     $options = array();
     $params = array();
     $return_properties = array('id', 'title');
@@ -152,7 +161,7 @@ function civicrm_subscribe_form($group_i
     if (!$email_only) {
       $group_name = 'this group';
       if (module_exists('civicrm')) {
-        civicrm_initialize(true);
+        civicrm_subscribe_civicrm_initialize();
         $group_names = array();
         foreach ($groups as $group_id) {
           $ccrm_groups =& crm_get_groups(array('id' => $group_id));
@@ -190,7 +199,7 @@ function civicrm_subscribe_block($op = '
 
   switch ($op) {
     case 'list':
-      civicrm_initialize(true);
+      civicrm_subscribe_civicrm_initialize();
       foreach (variable_get('civicrm_subscribe_groups', array()) as $group_id) {
         $ccrm_groups =& crm_get_groups(array('id' => $group_id));
         $group_name = _civicrm_subscribe_get_group_name($ccrm_groups[0]);
@@ -317,7 +326,7 @@ function civicrm_subscribe_form_validate
  */
 function civicrm_subscribe($email, $params = array(), $groups = array()) {
   if (module_exists('civicrm')) {
-    civicrm_initialize(true);
+    civicrm_subscribe_civicrm_initialize();
 
     // if groups specified, then get the default group(s)
     if (count($groups) == 0) {
@@ -399,7 +408,7 @@ function _civicrm_subscribe_error($error
 function civicrm_subscribe_confirm_page() {
   if (module_exists('civicrm')) {
     if ($ccid = db_result(db_query("SELECT ccid FROM {civicrm_subscribe} WHERE hash='%s'", arg(2)))) {
-      civicrm_initialize(true);
+      civicrm_subscribe_civicrm_initialize();
 
       $contact =& crm_get_contact(array('id' => $ccid));
 
@@ -536,7 +545,7 @@ function civicrm_subscribe_user($type, &
   global $user;
   if (module_exists('civicrm') && $type == 'submit' && $category == 'account' && $edituser->mail != $edit['mail'] && $user->uid == $edituser->uid) {
     // find the existing civicrm contact record
-    civicrm_initialize(true);
+    civicrm_subscribe_civicrm_initialize();
     $contact =& crm_get_contact(array('email' => $edituser->mail));
     if (isset($contact->id)) {
       // change the civicrm email, and set the flag to do not email while we confirm the new email address