Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.3' into develop

Browse Source 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
This commit is contained in:
Laurent Destailleur
2013-03-05 18:32:01 +01:00
parent faf1f440e4 ae2355fda5
commit c37e873ab4
7 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/lib/functions.lib.php
View File

@@ -4180,7 +4180,7 @@ function printCommonFooter($zone='private')
{
$micro_end_time=dol_microtime_float(true);
print "\n".'<script type="text/javascript">'."\n";
print 'console.log("';
print 'window.console && console.log("';
if (! empty($conf->global->MEMCACHED_SERVER)) print 'MEMCACHED_SERVER='.$conf->global->MEMCACHED_SERVER.' - ';
print 'MAIN_OPTIMIZE_SPEED='.(isset($conf->global->MAIN_OPTIMIZE_SPEED)?$conf->global->MAIN_OPTIMIZE_SPEED:'off');
print ' - Build time: '.ceil(1000*($micro_end_time-$micro_start_time)).' ms';