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

Merge branch 'develop' of github.com:atm-maxime/dolibarr into mko862

Browse Source 
Conflicts:
	htdocs/admin/system/perf.php
This commit is contained in:
Maxime Kohlhaas 2013-07-11 17:17:43 +02:00
commit 0d40debeac
1 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
htdocs/admin/system/perf.php
View File

@ -400,17 +400,10 @@ if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')
}
print '<br>';
}
<<<<<<< HEAD
// Product search
=======
// Product search
print '<br>';
print '<strong>'.$langs->trans("SearchOptim").'</strong>: ';
>>>>>>> 7485192cfbca23027d10cfdc41a33a14f332d23c
print '<br>';
print '<strong>'.$langs->trans("ProductSearch").'</strong>: ';
print '<br>';
$tab = array();
$sql = "SELECT COUNT(*) as nb";
@ -440,18 +433,6 @@ if ($resql)
}
// Browser
<<<<<<< HEAD
print '<br>';
print '<strong>'.$langs->trans("Browser").'</strong>: ';
var_dump($conf->browser);
print '<br>';
// Database statistics update
print '<br>';
print '<strong>'.$langs->trans("DatabaseStatistics").'</strong>: ';
print '<br>';
=======
print '<br>';
print '<strong>'.$langs->trans("Browser").'</strong>:<br>';
if (! in_array($conf->browser->name, array('chrome','opera','safari','firefox')))
@ -470,7 +451,6 @@ print '<br>';
print '<strong>'.$langs->trans("DatabaseStatistics").'</strong>: ';
print '<br>';
*/
>>>>>>> 7485192cfbca23027d10cfdc41a33a14f332d23c
llxFooter();