Merged revisions 2144-2150 from stable branch.

tbrehm

2010-12-16 b5a0dc34a3bebd221fe8a564595d4c644122e11d

 interface/lib/classes/tform.inc.php

@@ -143,9 +143,9 @@
               if(!file_exists($lng_file)) $lng_file = "../$module/lib/lang/en_".$this->formDef["name"].".lng";
               include($lng_file);
                }
				

            if(is_array($wb_global)) {
               $wb = array_merge($wb_global,$wb);
               $wb = $wb_global + $wb;
            }
            if(isset($wb_global)) unset($wb_global);
            
@@ -495,9 +495,7 @@
                                                $out = '';
                                                foreach($field['value'] as $k => $v) {
                                                    $selected = ($k == $field["default"])?' SELECTED':'';
                                       if(!empty($this->wordbook[$v]))
                                                                    $v = $this->wordbook[$v];
                                                    $out .= "<option value='$k'$selected>$v</option>\r\n";
                                                    $out .= "<option value='$k'$selected>".$this->lng($v)."</option>\r\n";
                                                }
                                        }
                                        if(isset($out)) $new_record[$key] = $out;