Index: og.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/og/og.module,v
retrieving revision 1.618
diff -u -p -r1.618 og.module
--- og.module	2 Jan 2009 03:58:21 -0000	1.618
+++ og.module	11 Mar 2009 20:19:34 -0000
@@ -417,7 +417,7 @@ function og_og($op, $gid, $uid, $args) {
       rules_invoke_event('og_'. $op, $uid, $gid);   
     }
     // Pending member was approved.
-    elseif ($op = 'user update' && $args['is_active']) {
+    elseif ($op == 'user update' && $args['is_active']) {
       rules_invoke_event('og_user_approved', $uid, $gid);
     }    
   }
@@ -2613,7 +2613,7 @@ function og_token_values($type, $object 
       $values['ogname-raw'] = '';
       $values['og-id'] = '';
       
-      if (is_array($object->og_groups)) {
+      if (!empty($object->og_groups)) {
         $gids = array_filter($object->og_groups);
         foreach ($gids as $gid) {
           $title = db_result(db_query("SELECT title FROM {node} WHERE nid = %d", $gid));
@@ -2626,8 +2626,6 @@ function og_token_values($type, $object 
       }
       break;    
   }
-  
-  return $values;
 }
 
 function og_readme() {
Index: modules/og_access/og_access.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/og/modules/og_access/og_access.module,v
retrieving revision 1.30
diff -u -p -r1.30 og_access.module
--- modules/og_access/og_access.module	2 Jan 2009 03:55:41 -0000	1.30
+++ modules/og_access/og_access.module	11 Mar 2009 20:19:34 -0000
@@ -138,12 +138,12 @@ function og_access_alter_nongroup_form(&
     
     // If the post is to a private group, visibility must default to one of the private options.
     $selected_groups = isset($form_state['values']['og_groups']) ? array_filter($form_state['values']['og_groups']) : $groups;
-    if (count($selected_groups)) {  
+    if (!empty($selected_groups)) {
       foreach ($selected_groups as $gid) {
         $group_node = new stdClass();
         $group_node->nid = $gid;
         og_load_group($group_node);
-         if ($group_node->og_private) {
+         if (!empty($group_node->og_private)) {
            // Try not to show checkbox if admin likes to reduce decisions for node authors.
            $vis = variable_get('og_visibility', 0) == OG_VISIBLE_BOTH ? OG_VISIBLE_GROUPONLY : OG_VISIBLE_CHOOSE_PRIVATE;
           break;