lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2013-01-29 15:25:00 +01:00
commit ab82a293e9
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/main.inc.php
View File

@ -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);
}

2
htdocs/webservices/server_user.php
View File

@ -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,