Index: fb_social.module
===================================================================
--- fb_social.module	(revision 4111)
+++ fb_social.module	(working copy)
@@ -37,7 +37,7 @@
     'access callback' => 'user_access',
     'access arguments' => array('administer site configuration'),
   );
-
+
   $items['admin/settings/fb/social/settings'] = array(
     'type' => MENU_DEFAULT_LOCAL_TASK,
     'title' => 'Settings',
@@ -47,8 +47,8 @@
     'access callback' => 'user_access',
     'access arguments' => array('administer site configuration'),
     'weight' => -10,
-  );
-
+  );
+
   $extra_settings = array('recommendations', 'livestream', 'activityfeed', 'facepile');
   foreach($extra_settings as $extra){
   $items["admin/settings/fb/social/$extra"] = array(
@@ -60,9 +60,9 @@
     'access callback' => 'user_access',
     'access arguments' => array('administer site configuration'),
     'weight' => 1,
-  );
+  );
   }
-
+
   return $items;
 }

@@ -129,17 +129,17 @@
   global $_fb_script_init;
   $_fb_script_init = TRUE;
   $attrs = array(
-      'site' => variable_get('fb_social_recommendation_site', ''),
+      'site' => variable_get('fb_social_recommendation_site', ''),
       'width' => variable_get('fb_social_recommendation_width', 300),
       'height' => variable_get('fb_social_recommendation_height', 300),
       'colorscheme' => variable_get('fb_social_recommendation_colorscheme', 'light'),
-      'font' => variable_get('fb_social_recommendation_font', ''),
-      'border_coler' => variable_get('fb_social_recommendation_border_color', ''),
-      'header' => variable_get('fb_social_recommendation_header', 1) ? 'true' : 'false',
+      'font' => variable_get('fb_social_recommendation_font', ''),
+      'border_coler' => variable_get('fb_social_recommendation_border_color', ''),
+      'header' => variable_get('fb_social_recommendation_header', 1) ? 'true' : 'false',
   );
-
+
   $attrs = drupal_attributes($attrs);
-
+
   return '<div id="fb-social-recommendation-widget"><fb:recommendations ' . $attrs . '></fb:recommendations></div>';
 }

@@ -147,18 +147,18 @@
   global $_fb_script_init;
   $_fb_script_init = TRUE;
   $attrs = array(
-      'site' => variable_get('fb_social_activityfeed_site', ''),
+      'site' => variable_get('fb_social_activityfeed_site', ''),
       'width' => variable_get('fb_social_activityfeed_width', 300),
       'height' => variable_get('fb_social_activityfeed_height', 300),
       'colorscheme' => variable_get('fb_social_activityfeed_colorscheme', 'light'),
-      'font' => variable_get('fb_social_activityfeed_font', ''),
-      'border_coler' => variable_get('fb_social_activityfeed_border_color', ''),
-      'header' => variable_get('fb_social_activityfeed_header', 1) ? 'true' : 'false',
+      'font' => variable_get('fb_social_activityfeed_font', ''),
+      'border_coler' => variable_get('fb_social_activityfeed_border_color', ''),
+      'header' => variable_get('fb_social_activityfeed_header', 1) ? 'true' : 'false',
       'recommendations' => variable_get('fb_social_recommendations_header', 1) ? 'true' : 'false',
   );
-
+
   $attrs = drupal_attributes($attrs);
-
+
   return '<div id="fb-social-activity-widget"><fb:activity ' . $attrs . '></fb:activity></div>';
 }

@@ -166,15 +166,15 @@
   global $_fb_script_init;
   $_fb_script_init = TRUE;
   $attrs = array(
-      'appid' => variable_get('fb_social_appid', ''),
-      'width' => variable_get('fb_social_livestream_width', 300),
+      'appid' => variable_get('fb_social_appid', ''),
+      'width' => variable_get('fb_social_livestream_width', 300),
       'height' => variable_get('fb_social_livestream_height', 500),
-      'always_post_to_friends' => variable_get('fb_social_livestream_posttofriends', 0) ? 'true' : 'false',
+      'always_post_to_friends' => variable_get('fb_social_livestream_posttofriends', 0) ? 'true' : 'false',

   );
-
+
   $attrs = drupal_attributes($attrs);
-
+
   return '<div class="fb-social-live-stream-widget"><fb:live-stream ' . $attrs . '></fb:live-stream></div>';
 }

@@ -188,11 +188,11 @@
       'width' => variable_get('fb_social_facepile_width', 200),

   );
-
+
   $attrs = drupal_attributes($attrs);
-
+
   return '<div class="fb-social-facepile-widget"><fb:facepile ' . $attrs . '></fb:facepile></div>';
-
+
 }


@@ -201,14 +201,14 @@
  */
 function fb_social_footer($main = 0){
   global $language, $_fb_script_init, $base_url;
-
+
   // If their is no fb plugin enabled on this page, do not load fb script then
   if (! $_fb_script_init) {
     return;
   }
-
+
   $languages = _map_active_languages();
-
+
   if (fb_social_auto_language()) {
     if (array_key_exists($language->language, $languages)) {
       $fb_locale = $languages[$language->language];
@@ -220,37 +220,39 @@
   else {
     $fb_locale = variable_get('fb_social_locale', 'en_US');
   }
-
+
   $appid = variable_get('fb_social_appid', '');
   $channel_url = $base_url . "/fb_social/channel";
-
+
   $output = '<div id="fb-root"></div>';
   $output .= "<script type=\"text/javascript\">
+  if (typeof(window.fbAsyncInit) == 'undefined') {
      window.fbAsyncInit = function() {
        FB.init({
          appId: " . drupal_to_js($appid) . ",
-         status: true,
+         status: true,
          cookie: true,
          xfbml: true,
          channelUrl: " . drupal_to_js($channel_url) . "
        });
-
+
        ";
-
+
   // let each module subscribe to different events
   $output .= implode("\n", module_invoke_all('fb_social_event_subscribe'));
   $output .= "
-
-
+
+
      };
      (function() {
-       var e = document.createElement('script');
+       var e = document.createElement('script');
        e.async = true;
        e.src = document.location.protocol + '//connect.facebook.net/" . $fb_locale . "/all.js';
        document.getElementById('fb-root').appendChild(e);
      }());
+  }
   </script>";
-
+
   return $output;
 }

@@ -260,7 +262,7 @@
 function fb_social_custom_channel_url() {
   header("Cache-Control: public, s-maxage=31536000, max-age=31536000");
   header("Expires: Sun, 1 Oct 2079 00:00:00 GMT");
-
+
   global $language;
   $languages = _map_active_languages();
   $fb_locale = "en_US";