diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php index 9a1d1698b82..de765bce8e6 100644 --- a/htdocs/html.form.class.php +++ b/htdocs/html.form.class.php @@ -662,18 +662,18 @@ class Form dolibarr_syslog("html.form.class::select_projects sql=$sql"); - $result=$this->db->query($sql); - if ($result) + $resql=$this->db->query($sql); + if ($resql) { print ''; print ' '; - $num = $this->db->num_rows($result); + $num = $this->db->num_rows($resql); $i = 0; if ($num) { while ($i < $num) { - $obj = $this->db->fetch_object(); + $obj = $this->db->fetch_object($resql); if (!empty($selected) && $selected == $obj->rowid) { print ''.$obj->title.''; @@ -704,7 +704,7 @@ class Form function select_produits($selected='',$htmlname='productid',$filtretype='',$limit=20,$price_level=0) { global $langs,$conf,$user; - if($conf->use_ajax) + if ($conf->use_ajax) { print $langs->trans("Ref").': '; print $langs->trans("Label").':'; diff --git a/htdocs/index.php b/htdocs/index.php index 68fdc316b00..99a99140875 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -54,10 +54,9 @@ if ($user->admin && ! defined("MAIN_REMOVE_INSTALL_WARNING")) if (is_dir(DOL_DOCUMENT_ROOT."/install") && is_readable(DOL_DOCUMENT_ROOT."/install")) { $langs->load("other"); - print ''; - print ''.$langs->trans("WarningInstallDirExists",DOL_DOCUMENT_ROOT."/install").' '; - print $langs->trans("WarningUntilDirRemoved",DOL_DOCUMENT_ROOT."/install").''; - print ''; + $message=$langs->trans("WarningInstallDirExists",DOL_DOCUMENT_ROOT."/install"); + $message.=$langs->trans("WarningUntilDirRemoved",DOL_DOCUMENT_ROOT."/install"); + print info_admin($message); print "\n"; } }