diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 2695a2fd3d0..f7081340f8a 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -675,14 +675,6 @@ if (! defined('NOREQUIRETRAN')) } } -// Use php template engine -if (! empty($conf->global->MAIN_USE_TEMPLATE_ENGINE) && ! defined('NOTEMPLATEENGINE')) -{ - require_once DOL_DOCUMENT_ROOT.'/includes/savant/Savant3.php'; - - $tpl = new Savant3(); -} - // Case forcing style from url if (GETPOST('theme')) { @@ -832,7 +824,7 @@ if (! function_exists("llxHeader")) function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $morequerystring='') { global $conf; - + // html header top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); @@ -845,7 +837,7 @@ if (! function_exists("llxHeader")) { left_menu('', $help_url, '', '', 1, $title); } - + // main area main_area($title); } diff --git a/htdocs/webservices/server_user.php b/htdocs/webservices/server_user.php index 82f8afbd8bf..226f061ba68 100644 --- a/htdocs/webservices/server_user.php +++ b/htdocs/webservices/server_user.php @@ -327,7 +327,7 @@ function getUser($authentication,$id,$ref='',$ref_ext='') 'datec' => dol_print_date($user->datec,'dayhourrfc'), 'datem' => dol_print_date($user->datem,'dayhourrfc'), 'fk_thirdparty' => $user->societe_id, -'fk_socpeople' => $user->fk_socpeople, +'fk_socpeople' => $user->contact_id, 'fk_member' => $user->fk_member, 'webcal_login' => $user->webcal_login, 'phenix_login' => $user->phenix_login,