Index: sites/all/modules/facebook_status/facebook_status.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/facebook_status/facebook_status.module,v
retrieving revision 1.5.6.141.2.6
diff -u -r1.5.6.141.2.6 facebook_status.module
--- sites/all/modules/facebook_status/facebook_status.module	25 Dec 2010 06:35:57 -0000	1.5.6.141.2.6
+++ sites/all/modules/facebook_status/facebook_status.module	15 Jan 2011 22:44:34 -0000
@@ -275,7 +275,7 @@
     ),
     'maxlength' => variable_get('facebook_status_length', 140),
     'refreshLink' => (bool) variable_get('facebook_status_refresh', 0)
-  ), 'setting');
+  )), 'setting');
 }
 
 /**
@@ -612,10 +612,12 @@
     return $contexts;
   }
   $result = db_query("SELECT * FROM {facebook_status_contexts}");
-  $contexts = array();
+  $contexts = module_invoke_all('facebook_status_context_info');
   while ($c = db_fetch_array($result)) {
-    $c['in_db'] = TRUE;
-    $contexts[$c['type']] = $c;
+    $contexts[$c['type']]['in_db'] = TRUE;
+    $contexts[$c['type']]['weight'] = $c['weight'];
+    $contexts[$c['type']]['view'] = $c['view'];
+    $contexts[$c['type']]['selectors'] = $c['selectors'];
   }
   $contexts += module_invoke_all('facebook_status_context_info');
   uasort($contexts, '_facebook_status_element_sort');
@@ -1085,3 +1087,4 @@
     return 'includes/ctools/'. $plugin;
   }
 }
+
Index: sites/all/modules/facebook_status/includes/utility/facebook_status.access.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/facebook_status/includes/utility/Attic/facebook_status.access.inc,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 facebook_status.access.inc
--- sites/all/modules/facebook_status/includes/utility/facebook_status.access.inc	30 Nov 2010 07:20:44 -0000	1.1.2.1
+++ sites/all/modules/facebook_status/includes/utility/facebook_status.access.inc	15 Jan 2011 22:44:34 -0000
@@ -39,6 +39,7 @@
  *   FALSE otherwise.
  */
 function facebook_status_user_access_converse() {
+  global $user;
   $uids = explode(',', arg(2), 2);
   if (empty($uids)) {
     return FALSE;
Index: sites/all/modules/facebook_status/includes/utility/facebook_status.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/facebook_status/includes/utility/Attic/facebook_status.admin.inc,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 facebook_status.admin.inc
--- sites/all/modules/facebook_status/includes/utility/facebook_status.admin.inc	30 Nov 2010 07:20:44 -0000	1.1.2.1
+++ sites/all/modules/facebook_status/includes/utility/facebook_status.admin.inc	15 Jan 2011 22:44:34 -0000
@@ -153,7 +153,7 @@
   $views = views_get_all_views();
   $options = array('' => t('None'));
   foreach ($views as $name => $view) {
-    if ($view->disabled == 0) {
+    if (empty($view->disabled)) {
       $options[$name] = $name;
     }
   }
Index: sites/all/modules/facebook_status/includes/utility/facebook_status.form.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/facebook_status/includes/utility/Attic/facebook_status.form.inc,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 facebook_status.form.inc
--- sites/all/modules/facebook_status/includes/utility/facebook_status.form.inc	23 Dec 2010 07:37:07 -0000	1.1.2.2
+++ sites/all/modules/facebook_status/includes/utility/facebook_status.form.inc	15 Jan 2011 22:44:34 -0000
@@ -58,7 +58,7 @@
   if ($conversation) {
     $args = explode(',', $arg);
     $count = count($args);
-    if ((($count === 1 && $args[0] != $user->uid) || ($count === 2 && is_numeric($args[1])) && is_numeric($args[0])) {
+    if (($count === 1 && $args[0] != $user->uid) || ($count === 2 && is_numeric($args[1])) && is_numeric($args[0])) {
       if (count($args) === 1) {
         $args[1] = $user->uid;
       }
@@ -66,6 +66,7 @@
       $output .= views_embed_view('facebook_status_conversation', 'default', $arg, $arg);
       $selectors[] = '.view-id-facebook_status_conversation';
     }
+
   }
   elseif (!empty($view)) {
     $output .= views_embed_view($view, 'default', $context['handler']->recipient_id($recipient), $type);