1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-19 21:02:09 +02:00

SimplerParse() fix. Db-verify fix for MPREFIX inclusion in xxxx_sql.php files.

This commit is contained in:
Cameron
2012-12-02 17:30:41 -08:00
parent 381053fad5
commit e1ed7b8f6a
3 changed files with 33 additions and 10 deletions

View File

@@ -545,7 +545,7 @@ class e_form
*/
function datepicker($name, $datestamp = false, $options = null)
{
if(vartrue($options) && !is_array($options))
if(vartrue($options) && is_string($options))
{
parse_str($options,$options);
}
@@ -612,8 +612,9 @@ class e_form
$text = "";
$class = (isset($classes[$type])) ? $classes[$type] : "tbox e-date";
$size = vartrue($options['size']) ? intval($options['size']) : 40;
$class = (isset($classes[$type])) ? $classes[$type] : "tbox e-date";
$size = vartrue($options['size']) ? intval($options['size']) : 40;
$required = vartrue($options['required']) ? "required" : "";
if(vartrue($options['inline']))
{
@@ -623,7 +624,7 @@ class e_form
}
else
{
$text .= "<input class='{$class}' type='text' size='{$size}' name='{$name}' id='{$id}' value='{$value}' data-date-format='{$dformat}' data-time-format='{$tformat}' data-date-ampm='{$ampm}' />";
$text .= "<input class='{$class}' type='text' size='{$size}' name='{$name}' id='{$id}' value='{$value}' data-date-format='{$dformat}' data-time-format='{$tformat}' data-date-ampm='{$ampm}' {$required} />";
}
return $text;