? storm--762002-6.patch
? storm--762002-7.patch
? stormproject-tests.patch
? stormperson/storm--762002-7.patch
Index: stormperson/stormperson.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/storm/stormperson/stormperson.module,v
retrieving revision 1.7.4.30
diff -u -p -r1.7.4.30 stormperson.module
--- stormperson/stormperson.module	7 Nov 2009 17:19:51 -0000	1.7.4.30
+++ stormperson/stormperson.module	19 Apr 2010 10:03:21 -0000
@@ -17,25 +17,26 @@ function stormperson_help($path, $arg) {
   return $o;
 }
 
-function stormperson_init() {
-  if (function_exists('drupal_set_content')) {
-    global $user;
-    if ($user->uid && !$user->stormorganization_nid || !$user->stormperson_nid) {
-      $r = db_query("SELECT nid, organization_nid FROM {stormperson} WHERE user_uid=%d", $user->uid);
-      if ($r) {
-        $a = db_fetch_object($r);
-        $user->stormperson_nid = $a->nid;
-        $user->stormorganization_nid = $a->organization_nid;
-      }
-    }
-    if (!$user->uid || !$user->stormperson_nid) {
-      $user->stormperson_nid = -1;
-    }
-    if (!$user->uid || !$user->stormorganization_nid) {
-      $user->stormorganization_nid = -1;
+function stormperson_boot() {
+  global $user;
+  
+  if ($user->uid && !$user->stormorganization_nid || !$user->stormperson_nid) {
+    $r = db_query("SELECT nid, organization_nid FROM {stormperson} WHERE user_uid=%d", $user->uid);
+    if ($r) {
+      $a = db_fetch_object($r);
+      $user->stormperson_nid = $a->nid;
+      $user->stormorganization_nid = $a->organization_nid;
     }
   }
+  if (!$user->uid || !$user->stormperson_nid) {
+    $user->stormperson_nid = -1;
+  }
+  if (!$user->uid || !$user->stormorganization_nid) {
+    $user->stormorganization_nid = -1;
+  }
+}
 
+function stormperson_init() {
   $settings = array(
     'storm' => array(
       'organization_people_url' => url('storm/organization_people_js/')