Merged changes up to 2.3.16 into unstable

[fa-stable.git] / includes / ui / ui_input.inc

diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc
index 04933bd68682dba3eea346740527feeb836883bd..a6537a83c8bd2a06ae407c980154ecaf1a6f3a6a 100644 (file)
--- a/includes/ui/ui_input.inc
+++ b/includes/ui/ui_input.inc
@@ -646,7 +646,8 @@ function date_cells($label, $name, $title = null, $check=null, $inc_days=0,
                $aspect .= ' style="color:#FF0000"';
 
        default_focus($name);
-       echo "<input type=\"text\" name=\"$name\" class=\"$class\" $aspect size=\"10\" maxlength=\"12\" value=\"" 
+       $size = (user_date_format()>3)?11:10; 
+       echo "<input type=\"text\" name=\"$name\" class=\"$class\" $aspect size=\"$size\" maxlength=\"12\" value=\"" 
         . $_POST[$name]. "\""
         .($title ? " title='$title'": '')." > $post_label";
        echo "</td>\n";
@@ -890,7 +891,7 @@ function inactive_control_cell($id, $value, $table, $key)
                        get_post('Update')) && (check_value('Inactive'.$id) != $value)) {
                        update_record_status($id, !$value, $table, $key);
                }
-               echo '<td align="center">'. checkbox(null, $name, $value, true, '', "align='center'")
+               echo '<td align="center">'. checkbox(null, $name, $value, true, '')
                        . hidden("LInact[$id]", $value, false) . '</td>';       
        }
 }