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

Merge pull request #2904 from fappels/develop

Browse Source 
FIX #2859 HTML units selector
This commit is contained in:
Laurent Destailleur 2015-05-29 17:21:32 +02:00
commit 888bec2df3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/class/html.form.class.php
View File

@ -2825,7 +2825,7 @@ class Form
/** /**
* Creates HTML units selector (code => label) * Creates HTML units selector (code => label)
* *
* @param string $selected Preselected code ('km', 'm', 'l', 'p', ...) * @param string $selected Preselected Unit ID
* @param string $htmlname Select name * @param string $htmlname Select name
* @param int $showempty Add a nempty line * @param int $showempty Add a nempty line
* @return string HTML select * @return string HTML select
@ -2846,13 +2846,13 @@ class Form
while($res = $this->db->fetch_object($resql)) while($res = $this->db->fetch_object($resql))
{ {
if ($selected == $res[0]) if ($selected == $res->rowid)
{ {
$return.='<option value="'.$res->code.'" selected>'.$langs->trans($res->label).'</option>'; $return.='<option value="'.$res->rowid.'" selected>'.$langs->trans($res->label).'</option>';
} }
else else
{ {
$return.='<option value="'.$res->code.'">'.$langs->trans($res->label).'</option>'; $return.='<option value="'.$res->rowid.'">'.$langs->trans($res->label).'</option>';
} }
} }
$return.='</select>'; $return.='</select>';