Fixed code style *again* because of non-updated PR, then move the facebook.inc.php inclusion to avoid NOTICE alerts - refs #7605

1.9.x
Yannick Warnier 11 years ago
parent 4c62cb083b
commit 61cc4aee45
  1. 2
      main/auth/external_login/facebook.inc.php
  2. 7
      main/inc/local.inc.php

@ -30,7 +30,7 @@ use Facebook\HttpClients\FacebookHttpable;
require_once dirname(__FILE__) . '/functions.inc.php';
// dont rename $facebook_config to $facebookConfig otherwise get a "Facebook\\FacebookSDKException"
FacebookSession::setDefaultApplication( $facebook_config['appId'],$facebook_config['secret']);
FacebookSession::setDefaultApplication($facebook_config['appId'], $facebook_config['secret']);
/**
* This function connect to facebook and retrieves the user info

@ -118,11 +118,12 @@
use \ChamiloSession as Session;
require_once api_get_path(SYS_PATH).'main/auth/external_login/facebook.inc.php';
// Facebook connexion, if activated
if (api_is_facebook_auth_activated() && !api_get_user_id()) {
facebookConnect();
require_once api_get_path(SYS_PATH).'main/auth/external_login/facebook.inc.php';
if (isset($facebook_config['appId']) && isset($facebook_config['secret'])) {
facebookConnect();
}
}
// Conditional login

Loading…
Cancel
Save