From 61cc4aee4584bbee506833bf0aced6550bce17d1 Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Wed, 24 Jun 2015 21:17:13 -0500 Subject: [PATCH] Fixed code style *again* because of non-updated PR, then move the facebook.inc.php inclusion to avoid NOTICE alerts - refs #7605 --- main/auth/external_login/facebook.inc.php | 2 +- main/inc/local.inc.php | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/main/auth/external_login/facebook.inc.php b/main/auth/external_login/facebook.inc.php index e7faa1ac3d..688f70ad70 100755 --- a/main/auth/external_login/facebook.inc.php +++ b/main/auth/external_login/facebook.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 diff --git a/main/inc/local.inc.php b/main/inc/local.inc.php index 5923315769..8eec360f41 100755 --- a/main/inc/local.inc.php +++ b/main/inc/local.inc.php @@ -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