From f5f3f205e97c2a3219897dd14de7d57659ce1181 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 2 Jul 2011 09:21:30 -0400 Subject: Fixes #3624 input views use class extending rather than overriding --- views/default/input/date.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'views/default/input/date.php') diff --git a/views/default/input/date.php b/views/default/input/date.php index afc40e899..e21a5f8f5 100644 --- a/views/default/input/date.php +++ b/views/default/input/date.php @@ -7,18 +7,23 @@ * @subpackage Core * * @uses $vars['value'] The current value, if any (as a unix timestamp) - * + * @uses $vars['class'] Additional CSS class */ +//@todo popup_calendar deprecated in 1.8. Remove in 2.0 +if (isset($vars['class'])) { + $vars['class'] = "elgg-input-date popup_calendar {$vars['class']}"; +} else { + $vars['class'] = "elgg-input-date popup_calendar"; +} + $defaults = array( 'value' => '', - 'class' => '', + 'disabled' => false, ); $vars = array_merge($defaults, $vars); -//@todo popup_calendar deprecated in 1.8. Remove in 2.0 -$vars['class'] = trim("elgg-input-date popup_calendar {$vars['class']}"); if ($vars['value'] > 86400) { $vars['value'] = date('n/d/Y', $vars['value']); -- cgit v1.2.3