summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Cohen2011-09-09 18:38:25 (GMT)
committer Dave Cohen2011-09-09 18:38:25 (GMT)
commitf8356c7e5397218a9dfa726f485aad4dbe9ea41e (patch)
tree1514a87ba77d456f8fa701cf09ede7a1a2667341
parentd08d73e558769a2c351a8c07486a641b3544d07f (diff)
refs #1166272 by funkym, Dave Cohen: correctly check the map_account setting, which is checkboxes (not radios like it once was).6.x-3.0-rc176.x-3.0
-rw-r--r--fb_user.admin.inc1
-rw-r--r--fb_user.module2
2 files changed, 1 insertions, 2 deletions
diff --git a/fb_user.admin.inc b/fb_user.admin.inc
index 1c2358d..66a9d7f 100644
--- a/fb_user.admin.inc
+++ b/fb_user.admin.inc
@@ -143,7 +143,6 @@ function fb_user_admin_form_alter(&$form, &$form_state, $form_id) {
'#title' => t('Map accounts'),
'#description' => t('Mapping an account means creating an entry in the fb_user table. This allows Drupal to know which Facebook id corresponds to which local uid. <br/>Matching based on email works when the email extended permission is requested and only if the user is not already mapped to another account.'),
'#options' => array(
- //FB_USER_OPTION_MAP_NEVER => t('Never map accounts'),
FB_USER_OPTION_MAP_ALWAYS => t('Map account when both local uid and Facebook id are known'),
FB_USER_OPTION_MAP_EMAIL => t('Map account when Facebook email exactly matches local account'),
),
diff --git a/fb_user.module b/fb_user.module
index 8ea8373..287ecf1 100644
--- a/fb_user.module
+++ b/fb_user.module
@@ -600,7 +600,7 @@ function fb_user_user($op, &$edit, &$account, $category = NULL) {
// A facebook user has logged in. We can map the two accounts together.
$fb_user_data = _fb_user_get_config($_fb_app);
if (($fbu = fb_facebook_user()) &&
- $fb_user_data['map_account'] == FB_USER_OPTION_MAP_ALWAYS &&
+ $fb_user_data['map_account'][FB_USER_OPTION_MAP_ALWAYS] &&
!fb_controls(FB_USER_CONTROL_NO_CREATE_MAP)) {
// Create fb_user record if it doesn't exist or update existing one