summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--contrib/fb_example.module4
-rw-r--r--fb_devel.module7
2 files changed, 8 insertions, 3 deletions
diff --git a/contrib/fb_example.module b/contrib/fb_example.module
index 34ed18b..826cb8a 100644
--- a/contrib/fb_example.module
+++ b/contrib/fb_example.module
@@ -217,7 +217,9 @@ function fb_example_comment(&$a1, $op) {
/**
* Implements hook_fb_required_perms_alter().
*
- * Builds a list of extended permissions required when authorizing the current facebook app.
+ * Builds a list of extended permissions required when authorizing the current
+ * facebook app.
+ *
* @see http://developers.facebook.com/docs/authentication/permissions
*/
function fb_example_fb_required_perms_alter(&$perms) {
diff --git a/fb_devel.module b/fb_devel.module
index 02cb8a1..d363f09 100644
--- a/fb_devel.module
+++ b/fb_devel.module
@@ -340,7 +340,9 @@ function fb_devel_footer($is_front) {
$output .= "<!--//--><![CDATA[//><!--\n";
//$output .= "debugger;\n"; // extra debugging.
//$output .= " jQuery(document).bind('fb_init', FB_Devel.initHandler);\n";
+ $output .= "if (typeof(FB_Devel) != 'undefined') {\n"; // avoid race condition.
$output .= " FB_Devel.sanityCheck()\n";
+ $output .= "}\n";
$output .= "\n//--><!]]>\n";
$output .= "\n</script>\n";
return $output;
@@ -548,11 +550,12 @@ function fb_devel_js() {
exit();
}
+/**
+ * Implements hook_block().
+ */
function fb_devel_block($op = 'list', $delta = 0, $edit = array()) {
if ($op == 'list') {
- // Provide two copies of same block, for iframe scenarios.
$items[0]['info'] = t('Facebook Devel Page Info');
- $items[1]['info'] = t('Facebook Devel Page Info 2');
return $items;
}
elseif ($op == 'view') {