[Joomla-commits] r22944 - in development/trunk: installation libraries/joomla/html

[githu...@jcode001.directrouter.com]

Author: github_bot
Date: 2012-03-23 09:46:17 -0500 (Fri, 23 Mar 2012)
New Revision: 22944

Modified:
development/trunk/installation/CHANGELOG
development/trunk/libraries/joomla/html/html.php
Log:
Merge branch 'master' of github.com:joomla/joomla-cms

Modified: development/trunk/installation/CHANGELOG
===================================================================
--- development/trunk/installation/CHANGELOG 2012-03-22 18:16:11 UTC (rev 22943)
+++ development/trunk/installation/CHANGELOG 2012-03-23 14:46:17 UTC (rev 22944)
@@ -26,6 +26,9 @@
- -> Removed
! -> Note

+23-Mar-2012 Christophe Demko
+ # [#28175] *Calendar readonly="true" status prevents loading custom calendars.
+
22-Mar-2012 Jean-Marie Simonet
$ Updating installation ini files cbq-IQ, de-DE, sv-SE
# [#28280] Regression in the com_installer warnings. Thanks Rouven

Modified: development/trunk/libraries/joomla/html/html.php
===================================================================
--- development/trunk/libraries/joomla/html/html.php 2012-03-22 18:16:11 UTC (rev 22943)
+++ development/trunk/libraries/joomla/html/html.php 2012-03-23 14:46:17 UTC (rev 22944)
@@ -864,7 +864,7 @@
$attribs = JArrayHelper::toString($attribs);
}

- if ((!$readonly) && (!$disabled))
+ if (!$readonly && !$disabled)
{
// Load the calendar behavior
JHtml::_('behavior.calendar');
@@ -891,12 +891,16 @@
);
$done[] = $id;
}
+ return '<input type="text" title="' . (0 !== (int) $value ? JHtml::_('date', $value) : '') . '" name="' . $name . '" id="' . $id
+ . '" value="' . htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . '" ' . $attribs . ' />'
+ . JHtml::_('image', 'system/calendar.png', JText::_('JLIB_HTML_CALENDAR'), array('class' => 'calendar', 'id' => $id . '_img'), true);
}
-
- return '<input type="text" title="' . (0 !== (int) $value ? JHtml::_('date', $value) : '') . '" name="' . $name . '" id="' . $id
- . '" value="' . htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . '" ' . $attribs . ' />'
- . ($readonly ? ''
- : JHtml::_('image', 'system/calendar.png', JText::_('JLIB_HTML_CALENDAR'), array('class' => 'calendar', 'id' => $id . '_img'), true));
+ else
+ {
+ return '<input type="text" title="' . (0 !== (int) $value ? JHtml::_('date', $value) : '')
+ . '" value="' . (0 !== (int) $value ? JHtml::_('date', $value, JFactory::getDbo()->getDateFormat()) : '') . '" ' . $attribs
+ . ' /><input type="hidden" name="' . $name . '" id="' . $id . '" value="' . htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . '" />';
+ }
}

/**

_______________________________________________
Joomla-commits mailing list
Joomla-...@joomlacode.org
http://joomlacode.org/mailman/listinfo/joomla-commits